diff --git a/ChangeLog b/ChangeLog
index 1c21c10a4..eb34f0d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,231 @@
+Changes in version 0.2.4.12-alpha - 2013-04-18
+  o Major features:
+    - Raise the default time that a client keeps an entry guard from
+      "1-2 months" to "2-3 months", as suggested by Tariq Elahi's WPES
+      2012 paper. (We would make it even longer, but we need better client
+      load balancing first.) Also, make the guard lifetime controllable
+      via a new GuardLifetime torrc option and a GuardLifetime consensus
+      parameter. Start of a fix for bug 8240; bugfix on 0.1.1.11-alpha.
+    - Directory authorities now prefer using measured bandwidths to
+      advertised ones when computing flags and thresholds. Resolves
+      ticket 8273.
+    - Directory authorities that have more than a threshold number
+      of relays with measured bandwidths now treat relays with unmeasured
+      bandwidths as having bandwidth 0. Resolves ticket 8435.
+
+  o Major bugfixes (assert / resource use):
+    - Avoid a bug where our response to TLS renegotation under certain
+      network conditions could lead to a busy-loop, with 100% CPU
+      consumption. Fixes bug 5650; bugfix on 0.2.0.16-alpha.
+    - Avoid an assertion when we discover that we'd like to write a cell
+      onto a closing connection: just discard the cell. Fixes another
+      case of bug 7350; bugfix on 0.2.4.4-alpha.
+
+  o Major bugfixes (client-side privacy):
+    - When we mark a circuit as unusable for new circuits, have it
+      continue to be unusable for new circuits even if MaxCircuitDirtiness
+      is increased too much at the wrong time, or the system clock jumps
+      backwards. Fixes bug 6174; bugfix on 0.0.2pre26.
+    - If ClientDNSRejectInternalAddresses ("do not believe DNS queries
+      which have resolved to internal addresses") is set, apply that
+      rule to IPv6 as well. Fixes bug 8475; bugfix on 0.2.0.7-alpha.
+    - When an exit relay rejects a stream with reason "exit policy", but
+      we only know an exit policy summary (e.g. from the microdesc
+      consensus) for it, do not mark the relay as useless for all exiting.
+      Instead, mark just the circuit as unsuitable for that particular
+      address. Fixes part of bug 7582; bugfix on 0.2.3.2-alpha.
+    - Allow applications to get proper stream isolation with
+      IsolateSOCKSAuth. Many SOCKS5 clients that want to offer
+      username/password authentication also offer "no authentication". Tor
+      had previously preferred "no authentication", so the applications
+      never actually sent Tor their auth details. Now Tor selects
+      username/password authentication if it's offered. You can disable
+      this behavior on a per-SOCKSPort basis via PreferSOCKSNoAuth. Fixes
+      bug 8117; bugfix on 0.2.3.3-alpha.
+
+  o Major bugfixes (other):
+    - When unable to find any working directory nodes to use as a
+      directory guard, give up rather than adding the same non-working
+      nodes to the directory guard list over and over. Fixes bug 8231;
+      bugfix on 0.2.4.8-alpha.
+
+  o Minor features:
+    - Reject as invalid most directory objects containing a NUL.
+      Belt-and-suspender fix for bug 8037.
+    - In our testsuite, create temporary directories with a bit more
+      entropy in their name to make name collisions less likely. Fixes
+      bug 8638.
+    - Add CACHED keyword to ADDRMAP events in the control protocol
+      to indicate whether a DNS result will be cached or not. Resolves
+      ticket 8596.
+    - Eliminate several instances where we use "Nickname=ID" to refer to
+      nodes in logs. Use "Nickname (ID)" instead. (Elsewhere, we still use
+      "$ID=Nickname", which is also acceptable.) Fixes bug 7065. Bugfix
+      on 0.2.3.21-rc, 0.2.4.5-alpha, 0.2.4.8-alpha, and 0.2.4.10-alpha.
+    - Update to the April 3 2013 Maxmind GeoLite Country database.
+
+  o Minor features (build):
+    - Detect and reject attempts to build Tor with threading support
+      when OpenSSL has been compiled without threading support.
+      Fixes bug 6673.
+    - Clarify that when autoconf is checking for nacl, it is checking
+      specifically for nacl with a fast curve25519 implementation.
+      Fixes bug 8014.
+    - Warn if building on a platform with an unsigned time_t: there
+      are too many places where Tor currently assumes that time_t can
+      hold negative values. We'd like to fix them all, but probably
+      some will remain.
+
+  o Minor bugfixes (build):
+    - Fix compilation warning with some versions of clang that would
+      prefer the -Wswitch-enum compiler flag to warn about switch
+      statements with missing enum values, even if those switch
+      statements have a "default:" statement. Fixes bug 8598; bugfix
+      on 0.2.4.10-alpha.
+    - Build Tor correctly on 32-bit platforms where the compiler can build
+      but not run code using the "uint128_t" construction. Fixes bug 8587;
+      bugfix on 0.2.4.8-alpha.
+    - Add the old src/or/micro-revision.i filename to CLEANFILES.
+      On the off chance that somebody has one, it will go away as soon
+      as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha.
+    - Fix some bugs in tor-fw-helper-natpmp when trying to build and
+      run it on Windows. More bugs likely remain. Patch from Gisle Vanem.
+      Fixes bug 7280; bugfix on 0.2.3.1-alpha.
+
+  o Minor bugfixes (protocol):
+    - Fix the handling of a TRUNCATE cell when it arrives while the
+      circuit extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1.
+    - Fix a misframing issue when reading the version numbers in a
+      VERSIONS cell. Previously we would recognize [00 01 00 02] as
+      'version 1, version 2, and version 0x100', when it should have
+      only included versions 1 and 2. Fixes bug 8059; bugfix on
+      0.2.0.10-alpha. Reported pseudonymously.
+    - Make the format and order of STREAM events for DNS lookups
+      consistent among the various ways to launch DNS lookups. Fixes
+      bug 8203; bugfix on 0.2.0.24-rc. Patch by "Desoxy."
+    - Correct our check for which versions of Tor support the EXTEND2
+      cell. We had been willing to send it to Tor 0.2.4.7-alpha and
+      later, when support was really added in version 0.2.4.8-alpha.
+      Fixes bug 8464; bugfix on 0.2.4.8-alpha.
+
+  o Minor bugfixes (correctness):
+    - Correctly store microdescriptors and extrainfo descriptors with
+      an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha.
+      Bug reported by "cypherpunks".
+    - Increase the width of the field used to remember a connection's
+      link protocol version to two bytes. Harmless for now, since the
+      only currently recognized versions are one byte long. Reported
+      pseudonymously. Fixes bug 8062; bugfix on 0.2.0.10-alpha.
+    - If the state file's path bias counts are invalid (presumably from a
+      buggy Tor prior to 0.2.4.10-alpha), make them correct. Also add
+      additional checks and log messages to the scaling of Path Bias
+      counts, in case there still are remaining issues with scaling.
+      Should help resolve bug 8235.
+
+  o Minor bugfixes (syscalls):
+    - Always check the return values of functions fcntl() and
+      setsockopt(). We don't believe these are ever actually failing in
+      practice, but better safe than sorry. Also, checking these return
+      values should please analysis tools like Coverity. Patch from
+      'flupzor'. Fixes bug 8206; bugfix on all versions of Tor.
+    - Use direct writes rather than stdio when building microdescriptor
+      caches, in an attempt to mitigate bug 8031, or at least make it
+      less common.
+
+  o Minor bugfixes (config):
+    - When rejecting a configuration because we were unable to parse a
+      quoted string, log an actual error message. Fix for bug 7950;
+      bugfix on 0.2.0.16-alpha.
+    - Behave correctly when the user disables LearnCircuitBuildTimeout
+      but doesn't tell us what they would like the timeout to be. Fixes
+      bug 6304; bugfix on 0.2.2.14-alpha.
+    - When autodetecting the number of CPUs, use the number of available
+      CPUs in preference to the number of configured CPUs. Inform the
+      user if this reduces the number of available CPUs. Fixes bug 8002.
+      Bugfix on 0.2.3.1-alpha.
+    - Elevate the severity of the warning message when setting
+      EntryNodes but disabling UseGuardNodes to an error. The outcome
+      of letting Tor proceed with those options enabled (which causes
+      EntryNodes to get ignored) is sufficiently different from what
+      was expected that it's best to just refuse to proceed. Fixes bug
+      8180; bugfix on 0.2.3.11-alpha.
+    - Allow TestingTorNetworks to override the 4096-byte minimum for
+      the Fast threshold. Otherwise they can't bootstrap until they've
+      observed more traffic. Fixes bug 8508; bugfix on 0.2.4.10-alpha.
+    - Fix some logic errors when the user manually overrides the
+      PathsNeededToBuildCircuits option in torrc. Fixes bug 8599; bugfix
+      on 0.2.4.10-alpha.
+
+  o Minor bugfixes (log messages to help diagnose bugs):
+    - If we fail to free a microdescriptor because of bug 7164, log
+      the filename and line number from which we tried to free it.
+      This should help us finally fix bug 7164.
+    - Add another diagnostic to the heartbeat message: track and log
+      overhead that TLS is adding to the data we write. If this is
+      high, we are sending too little data to SSL_write at a time.
+      Diagnostic for bug 7707.
+    - Add more detail to a log message about relaxed timeouts. Hopefully
+      this additional detail will allow us to diagnose the cause of
+      bug 7799.
+    - Warn more aggressively when flushing microdescriptors to a
+      microdescriptor cache fails, in an attempt to mitigate bug 8031,
+      or at least make it more diagnosable.
+    - Improve debugging output to attempt to diagnose the underlying
+      cause of bug 8185.
+    - Log the purpose of a path-bias testing circuit correctly.
+      Improves a log message from bug 8477; bugfix on 0.2.4.8-alpha.
+
+  o Minor bugfixes (0.2.4.x log messages that were too noisy):
+    - Use circuit creation time for network liveness evaluation. This
+      should eliminate warning log messages about liveness caused
+      by changes in timeout evaluation. Fixes bug 6572; bugfix on
+      0.2.4.8-alpha.
+    - Reduce a path bias length check notice log to info. The notice
+      is triggered when creating controller circuits. Fixes bug 8196;
+      bugfix on 0.2.4.8-alpha.
+    - Fix a path state issue that triggered a notice during relay startup.
+      Fixes bug 8320; bugfix on 0.2.4.10-alpha.
+    - Reduce occurrences of warns about circuit purpose in
+      connection_ap_expire_building(). Fixes bug 8477; bugfix on
+      0.2.4.11-alpha.
+
+  o Minor bugfixes (pre-0.2.4.x log messages that were too noisy):
+    - If we encounter a write failure on a SOCKS connection before we
+      finish our SOCKS handshake, don't warn that we closed the
+      connection before we could send a SOCKS reply. Fixes bug 8427;
+      bugfix on 0.1.0.1-rc.
+    - Correctly recognize that [::1] is a loopback address. Fixes
+      bug 8377; bugfix on 0.2.1.3-alpha.
+    - Fix a directory authority warn caused when we have a large amount
+      of badexit bandwidth. Fixes bug 8419; bugfix on 0.2.2.10-alpha.
+    - Don't attempt to relax the timeout of already opened 1-hop circuits.
+      They might never timeout. This should eliminate some/all cases of
+      the relaxed timeout log message.
+    - Don't log inappropriate heartbeat messages when hibernating: a
+      hibernating node is _expected_ to drop out of the consensus,
+      decide it isn't bootstrapped, and so forth. Fixes bug
+      7302; bugfix on 0.2.3.1-alpha.
+    - Don't complain about bootstrapping problems while hibernating.
+      These complaints reflect a general code problem, but not one
+      with any problematic effects. (No connections are actually
+      opened.) Fixes part of bug 7302; bugfix on 0.2.3.2-alpha.
+
+  o Documentation fixes:
+    - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
+      names match. Fixes bug 7768.
+    - Make the torify manpage no longer refer to tsocks; torify hasn't
+      supported tsocks since 0.2.3.14-alpha.
+    - Make the tor manpage no longer reference tsocks.
+    - Fix the GeoIPExcludeUnknown documentation to refer to
+      ExcludeExitNodes rather than the currently nonexistent
+      ExcludeEntryNodes. Spotted by "hamahangi" on tor-talk.
+
+  o Removed files:
+    - The tor-tsocks.conf is no longer distributed or installed. We
+      recommend that tsocks users use torsocks instead. Resolves
+      ticket 8290.
+
+
 Changes in version 0.2.4.11-alpha - 2013-03-11
   Tor 0.2.4.11-alpha makes relay measurement by directory authorities
   more robust, makes hidden service authentication work again, and
diff --git a/changes/bug5650 b/changes/bug5650
deleted file mode 100644
index 401e31707..000000000
--- a/changes/bug5650
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Avoid a bug where our response to TLS renegotation under certain
-      network conditions could lead to a busy-loop, with 100% CPU
-      consumption. Fixes bug 5650; bugfix on 0.2.0.16-alpha.
-
diff --git a/changes/bug6174 b/changes/bug6174
deleted file mode 100644
index 79d2930ec..000000000
--- a/changes/bug6174
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - When we mark a circuit as unusable for new circuits, have it
-      continue to be unusable for new circuits even if MaxCircuitDirtiness
-      is increased too much at the wrong time, or the system clock jumped
-      backwards. Fix for bug 6174; bugfix on 0.0.2pre26.
-     
diff --git a/changes/bug6206 b/changes/bug6206
deleted file mode 100644
index 61a16d291..000000000
--- a/changes/bug6206
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Always check the return values of functions fcntl() and
-      setsockopt(). We don't believe these are ever actually failing in
-      practice, but better safe than sorry. Also, checking these return
-      values should please some analysis tools (like Coverity). Patch
-      from 'flupzor'. Fix for bug 8206; bugfix on all versions of Tor.
diff --git a/changes/bug6304 b/changes/bug6304
deleted file mode 100644
index 445560a8e..000000000
--- a/changes/bug6304
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Behave correctly when the user disables LearnCircuitBuildTimeout
-      but doesn't tell us what they would like the timeout to be. Fixes
-      bug 6304; bugfix on 0.2.2.14-alpha. 
diff --git a/changes/bug6572 b/changes/bug6572
deleted file mode 100644
index 6508d1bcb..000000000
--- a/changes/bug6572
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (log messages)
-   - Use circuit creation time for network liveness evaluation. This
-     should eliminate warning log messages about liveness caused by
-     changes in timeout evaluation. Fixes bug 6572; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug6673 b/changes/bug6673
deleted file mode 100644
index 506b44989..000000000
--- a/changes/bug6673
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (build):
-    - Detect and reject attempts to build Tor with threading support
-      when OpenSSL have been compiled with threading support disabled.
-      Fixes bug 6673.
diff --git a/changes/bug7065 b/changes/bug7065
deleted file mode 100644
index 1ca684102..000000000
--- a/changes/bug7065
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfix (log cleanups):
-   - Eliminate several instances where we use Nickname=ID to refer to
-     nodes in logs. Use Nickname (ID) instead. (Elsewhere, we still use
-     $ID=Nickname, which is also acceptable.) Fixes bug #7065. Bugfix
-     on 0.2.3.21-rc, 0.2.4.5-alpha, 0.2.4.8-alpha, and 0.2.4.10-alpha.
diff --git a/changes/bug7143 b/changes/bug7143
deleted file mode 100644
index d26135ae6..000000000
--- a/changes/bug7143
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (build):
-    - Add the old src/or/micro-revision.i filename to CLEANFILES.
-      On the off chance that somebody has one, it will go away as soon
-      as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha.
diff --git a/changes/bug7164_diagnostic b/changes/bug7164_diagnostic
deleted file mode 100644
index 8bedfc4bd..000000000
--- a/changes/bug7164_diagnostic
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (bug diagnostic):
-    - If we fail to free a microdescriptor because of bug #7164, log
-      the filename and line number from which we tried to free it.
-      This should help us finally fix #7164.
diff --git a/changes/bug7280 b/changes/bug7280
deleted file mode 100644
index ef5d36a80..000000000
--- a/changes/bug7280
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix some bugs in tor-fw-helper-natpmp when trying to build and
-      run it on Windows. More bugs likely remain. Patch from Gisle Vanem.
-      Fixes bug 7280; bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug7302 b/changes/bug7302
deleted file mode 100644
index fec615ff9..000000000
--- a/changes/bug7302
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Minor bugfixes:
-    - Don't log inappropriate heartbeat messages when hibernating: a
-      hibernating node is _expected_ to drop out of the consensus,
-      decide it isn't bootstrapped, and so forth.  Fixes part of bug
-      7302; bugfix on 0.2.3.1-alpha.
-
-    - Don't complain about bootstrapping problems while hibernating.
-      These complaints reflect a general code problems, but not one
-      with any problematic effects. (No connections are actually
-      opened.) Fixes part of bug 7302; bugfix on 0.2.3.2-alpha.
-
diff --git a/changes/bug7350 b/changes/bug7350
deleted file mode 100644
index b0ee9d091..000000000
--- a/changes/bug7350
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Avoid an assertion when we discover that we'd like to write a cell
-      onto a closing connection: just discard the cell. Fixes another
-      case of bug 7350; bugfix on 0.2.4.4-alpha.
diff --git a/changes/bug7582 b/changes/bug7582
deleted file mode 100644
index f3b063576..000000000
--- a/changes/bug7582
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Major bugfixes:
-
-    - When an exit node tells us that it is rejecting because of its
-      exit policy a stream we expected it to accept (because of its exit
-      policy), do not mark the node as useless for exiting if our
-      expectation was only based on an exit policy summary.  Instead,
-      mark the circuit as unsuitable for that particular address. Fixes
-      part of bug 7582; bugfix on 0.2.3.2-alpha.
-
diff --git a/changes/bug7707_diagnostic b/changes/bug7707_diagnostic
deleted file mode 100644
index 0c3138e78..000000000
--- a/changes/bug7707_diagnostic
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Add another diagnostic to the heartbeat message: track and log
-      overhead that TLS is adding to the data we write.  If this is
-      high, we are sending too little data to SSL_write at a time.
-      Diagnostic for bug 7707.
diff --git a/changes/bug7768 b/changes/bug7768
deleted file mode 100644
index e3f9600af..000000000
--- a/changes/bug7768
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation fixes:
-    - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
-      names match. Fixes bug 7768.
diff --git a/changes/bug7799 b/changes/bug7799
deleted file mode 100644
index ed4570129..000000000
--- a/changes/bug7799
+++ /dev/null
@@ -1,7 +0,0 @@
- o Minor changes (log clarification)
-   - Add more detail to a log message about relaxed timeouts. Hopefully
-     this additional detail will allow us to diagnose the cause of bug 7799.
- o Minor bugfixes
-   - Don't attempt to relax the timeout of already opened 1-hop circuits.
-     They might never timeout. This should eliminate some/all cases of
-     the relaxed timeout log message.
diff --git a/changes/bug7947 b/changes/bug7947
deleted file mode 100644
index 6200ba2d8..000000000
--- a/changes/bug7947
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix the handling of a TRUNCATE cell when it arrives while the circuit
-      extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1.
-
diff --git a/changes/bug7950 b/changes/bug7950
deleted file mode 100644
index e62cca07a..000000000
--- a/changes/bug7950
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When rejecting a configuration because we were unable to parse a
-      quoted string, log an actual error message. Fix for bug 7950;
-      bugfix on 0.2.0.16-alpha.
diff --git a/changes/bug8002 b/changes/bug8002
deleted file mode 100644
index d6e2ff249..000000000
--- a/changes/bug8002
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - When autodetecting the number of CPUs, use the number of available
-      CPUs in preferernce to the number of configured CPUs. Inform the
-      user if this reduces the number of avialable CPUs. Fix for bug 8002.
-      Bugfix on 0.2.3.1-alpha.
diff --git a/changes/bug8014 b/changes/bug8014
deleted file mode 100644
index c09a86098..000000000
--- a/changes/bug8014
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor usability improvements (build):
-    - Clarify that when autconf is checking for nacl, it is checking
-      specifically for nacl with a fast curve25519 implementation.
-      Fixes bug 8014.
-
diff --git a/changes/bug8031 b/changes/bug8031
deleted file mode 100644
index 17329ec5b..000000000
--- a/changes/bug8031
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes:
-    - Use direct writes rather than stdio when building microdescriptor
-      caches, in an attempt to mitigate bug 8031, or at least make it
-      less common.
-    - Warn more aggressively when flushing microdescriptors to a
-      microdescriptor cache fails, in an attempt to mitegate bug 8031,
-      or at least make it more diagnosable.
diff --git a/changes/bug8037 b/changes/bug8037
deleted file mode 100644
index 989745fc3..000000000
--- a/changes/bug8037
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-    - Correctly store microdescriptors and extrainfo descriptors with
-      an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha.
-      Bug reported by "cypherpunks".
-
-  o Minor features:
-    - Reject as invalid most directory objects containing a
-      NUL. Belt-and-suspender fix for bug 8037.
diff --git a/changes/bug8059 b/changes/bug8059
deleted file mode 100644
index 47273ed0a..000000000
--- a/changes/bug8059
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (protocol conformance):
-    - Fix a misframing issue when reading the version numbers in a
-      VERSIONS cell. Previously we would recognize [00 01 00 02] as
-      'version 1, version 2, and version 0x100', when it should have
-      only included versions 1 and 2. Fixes bug 8059; bugfix on
-      0.2.0.10-alpha. Reported pseudonymously.
diff --git a/changes/bug8062 b/changes/bug8062
deleted file mode 100644
index 805e51ed4..000000000
--- a/changes/bug8062
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Increase the width of the field used to remember a connection's
-      link protocol version to two bytes. Harmless for now, since the
-      only currently recognized versions are one byte long.  Reported
-      pseudynmously.  Fixes bug 8062, bugfix on 0.2.0.10-alpha.
diff --git a/changes/bug8117 b/changes/bug8117
deleted file mode 100644
index 910e8056f..000000000
--- a/changes/bug8117
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Major bugfixes:
-
-    - Many SOCKS5 clients, when configured to offer a username/password,
-      offer both username/password authentication and "no authentication".
-      Tor had previously preferred no authentication, but this was
-      problematic when trying to make applications get proper stream
-      isolation with IsolateSOCKSAuth. Now, on any SOCKS port with
-      IsolateSOCKSAuth turned on (which is the default), Tor selects
-      username/password authentication if it's offered. If this confuses your
-      application, you can disable it on a per-SOCKSPort basis via
-      PreferSOCKSNoAuth. Fixes bug 8117; bugfix on 0.2.3.3-alpha.
-
-
diff --git a/changes/bug8180 b/changes/bug8180
deleted file mode 100644
index 39e6ce7f9..000000000
--- a/changes/bug8180
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (security usability):
-    - Elevate the severity of the warning message when setting
-      EntryNodes but disabling UseGuardNodes to an error. The outcome
-      of letting Tor procede with those options enabled (which causes
-      EntryNodes to get ignored) is sufficiently different from what
-      was expected that it's best to just refuse to proceed. Fixes bug
-      8180; bugfix on 0.2.3.11-alpha.
diff --git a/changes/bug8185_diagnostic b/changes/bug8185_diagnostic
deleted file mode 100644
index b0f888475..000000000
--- a/changes/bug8185_diagnostic
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Improve debugging output to attempt to diagnose the underlying
-      cause of bug 8185.
diff --git a/changes/bug8203 b/changes/bug8203
deleted file mode 100644
index d26dc0fcc..000000000
--- a/changes/bug8203
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Make the format and order of STREAM events for DNS lookups consistent
-      among the various ways to launch DNS lookups. Fix for bug 8203;
-      bugfix on 0.2.0.24-rc. Patch by "Desoxy."
diff --git a/changes/bug8231 b/changes/bug8231
deleted file mode 100644
index fd87a1dae..000000000
--- a/changes/bug8231
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - When unable to find any working directory nodes to use as a
-      directory guard, give up rather than adding the same non-working
-      nodes to the list over and over. Fixes bug 8231; bugfix on
-      0.2.4.8-alpha.
diff --git a/changes/bug8235-diagnosing b/changes/bug8235-diagnosing
deleted file mode 100644
index b760035cf..000000000
--- a/changes/bug8235-diagnosing
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor features (diagnostic)
-   - If the state file's path bias counts are invalid (presumably from a
-     buggy tor prior to 0.2.4.10-alpha), make them correct.
-   - Add additional checks and log messages to the scaling of Path Bias
-     counts, in case there still are remaining issues with scaling.
diff --git a/changes/bug8273 b/changes/bug8273
deleted file mode 100644
index 257f57e7a..000000000
--- a/changes/bug8273
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Critical bugfixes:
-    - When dirserv.c computes flags and thresholds, use measured bandwidths
-      in preference to advertised ones.
diff --git a/changes/bug8290 b/changes/bug8290
deleted file mode 100644
index d1fce7d8b..000000000
--- a/changes/bug8290
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Removed files:
-    - The tor-tsocks.conf is no longer distributed or installed. We
-      recommend that tsocks users use torsocks instead. Resolves
-      ticket 8290.
-
-  o Documentation fixes:
-    - The torify manpage no longer refers to tsocks; torify hasn't
-      supported tsocks since 0.2.3.14-alpha.
-    - The manpages no longer reference tsocks.
diff --git a/changes/bug8377 b/changes/bug8377
deleted file mode 100644
index c9ad151bc..000000000
--- a/changes/bug8377
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Correctly recognize that [::1] is a loopback address. Fixes bug #8377;
-      bugfix on 0.2.1.3-alpha.
diff --git a/changes/bug8408 b/changes/bug8408
deleted file mode 100644
index ae9cf172e..000000000
--- a/changes/bug8408
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Allow TestingTorNetworks to override the 4096-byte minimum for the Fast
-      threshold. Otherwise they can't bootstrap until they've observed more
-      traffic. Fixes bug 8508; bugfix on 0.2.4.10-alpha.
diff --git a/changes/bug8427 b/changes/bug8427
deleted file mode 100644
index 22b003fc3..000000000
--- a/changes/bug8427
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - If we encounter a write failure on a SOCKS connection before we
-      finish our SOCKS handshake, don't warn that we closed the
-      connection before we could send a SOCKS reply. Fixes bug 8427;
-      bugfix on 0.1.0.1-rc.
diff --git a/changes/bug8435 b/changes/bug8435
deleted file mode 100644
index da7ca7c1f..000000000
--- a/changes/bug8435
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - When dirserv.c computes flags and thresholds, ignore advertised
-      bandwidths if we have more than a threshold number of routers with
-      measured bandwidths.
diff --git a/changes/bug8464 b/changes/bug8464
deleted file mode 100644
index 74ff2e39f..000000000
--- a/changes/bug8464
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Correct our check for which versions of Tor support the EXTEND2
-      cell.  We had been willing to send it to Tor 0.2.4.7-alpha and
-      later, when support was really added in version 0.2.4.8-alpha.
-      Fixes bug 8464; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug8475 b/changes/bug8475
deleted file mode 100644
index eb8debedb..000000000
--- a/changes/bug8475
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - If configured via ClientDNSRejectInternalAddresses not to report
-      DNS queries which have resolved to internal addresses, apply that
-      rule to IPv6 as well. Fixes bug 8475; bugfix on 0.2.0.7-alpha.
diff --git a/changes/bug8477-easypart b/changes/bug8477-easypart
deleted file mode 100644
index 0f8f1031c..000000000
--- a/changes/bug8477-easypart
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Log the purpose of a path-bias testing circuit correctly.
-      Improves a log message from bug 8477; bugfix on 0.2.4.8-alpha.  
diff --git a/changes/bug8587 b/changes/bug8587
deleted file mode 100644
index 84d2f1ec0..000000000
--- a/changes/bug8587
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (build):
-    - Build Tor correctly on 32-bit platforms where the compiler can build
-      but not run code using the "uint128_t" construction. Fixes bug 8587;
-      bugfix on 0.2.4.8-alpha.
-
diff --git a/changes/bug8596 b/changes/bug8596
deleted file mode 100644
index dd36bad85..000000000
--- a/changes/bug8596
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Add CACHED keyword to ADDRMAP events in the control protocol to indicate
-      whether a DNS result will be cached or not.
diff --git a/changes/bug8598 b/changes/bug8598
deleted file mode 100644
index e31c8f3c7..000000000
--- a/changes/bug8598
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Bugfixes:
-    - Fix compilation warning with some versions of clang that would prefer
-      the -Wswitch-enum compiler flag to warn about switch statements with
-      missing enum values, even if those switch statements have a default:
-      statement. Fixes bug 8598; bugfix on 0.2.4.10-alpha.
-
diff --git a/changes/bug8599 b/changes/bug8599
deleted file mode 100644
index 204ef58c3..000000000
--- a/changes/bug8599
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix some logic errors when the user manually overrides the
-      PathsNeededToBuildCircuits option in torrc. Fixes bug 8599; bugfix
-      on 0.2.4.10-alpha.
diff --git a/changes/bug8638 b/changes/bug8638
deleted file mode 100644
index 3a790e567..000000000
--- a/changes/bug8638
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features
-   In our testsuite, create temporary directories with a bit more entropy
-   in their name to make name collissions less likely.  Fixes bug 8638.
diff --git a/changes/fix-geoipexclude-doc b/changes/fix-geoipexclude-doc
deleted file mode 100644
index 63b544ef2..000000000
--- a/changes/fix-geoipexclude-doc
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation fixes:
-    - Fix the GeoIPExcludeUnknown documentation to refer to ExcludeExitNodes
-      rather than the currently nonexistent ExcludeEntryNodes. Spotted by
-      "hamahangi" on tor-talk.
diff --git a/changes/geoip-apr2013 b/changes/geoip-apr2013
deleted file mode 100644
index 74d9c63b7..000000000
--- a/changes/geoip-apr2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the April 3 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/log-noise b/changes/log-noise
deleted file mode 100644
index bbbf0d2c0..000000000
--- a/changes/log-noise
+++ /dev/null
@@ -1,11 +0,0 @@
- o Minor bugfixes (log message reduction)
-   - Fix a path state issue that triggered a notice during relay startup.
-     Fixes bug #8320; bugfix on 0.2.4.10-alpha.
-   - Reduce occurrences of warns about circuit purpose in
-     connection_ap_expire_building(). Fixes bug #8477; bugfix on
-     0.2.4.11-alpha.
-   - Fix a directory authority warn caused when we have a large amount
-     of badexit bandwidth.  Fixes bug #8419; bugfix on 0.2.2.10-alpha.
-   - Reduce a path bias length check notice log to info. The notice
-     is triggered when creating controller circuits. Fixes bug #8196;
-     bugfix on 0.2.4.8-alpha.
diff --git a/changes/ticket8240 b/changes/ticket8240
deleted file mode 100644
index 91e6f8c14..000000000
--- a/changes/ticket8240
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major security fixes:
-    - Make the default guard lifetime controllable via a new
-      GuardLifetime torrc option and a GuardLifetime consensus
-      parameter. Start of a fix for bug 8240; bugfix on 0.1.1.11-alpha.
diff --git a/changes/warn-unsigned-time_t b/changes/warn-unsigned-time_t
deleted file mode 100644
index 5f0c36d09..000000000
--- a/changes/warn-unsigned-time_t
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Build improvements:
-    - Warn if building on a platform with an unsigned time_t: there
-      are too many places where Tor currently assumes that time_t can
-      hold negative values. We'd like to fix them all, but probably
-      some will remain.