fold in new changes files

6 files changed, 38 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bf0c3faa8..333213dccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,30 @@
-Changes in version 0.2.4.13-alpha - 2013-06-1?
+Changes in version 0.2.4.13-alpha - 2013-06-14
+  Tor 0.2.4.13-alpha fixes a variety of potential remote crash
+  vulnerabilities, makes socks5 username/password circuit isolation
+  actually actually work (this time for sure!), and cleans up a bunch
+  of other issues in preparation for a release candidate.
+
+  o Major bugfixes (robustness):
+    - Close any circuit that has too many cells queued on it. Fixes
+      bug 9063; bugfix on the 54th commit of Tor. This bug is a further
+      fix beyond bug 6252, whose fix was merged into 0.2.3.21-rc.
+    - Prevent the get_freelists() function from running off the end of
+      the list of freelists if it somehow gets an unrecognized
+      allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by
+      eugenis.
+    - Avoid an assertion failure on OpenBSD (and perhaps other BSDs)
+      when an exit connection with optimistic data succeeds immediately
+      rather than returning EINPROGRESS. Fixes bug 9017; bugfix on
+      0.2.3.1-alpha.
+    - Fix a directory authority crash bug when building a consensus
+      using an older consensus as its basis. Fixes bug 8833. Bugfix
+      on 0.2.4.12-alpha.
 
   o Major bugfixes:
     - Avoid a memory leak where we would leak a consensus body when we
       find that a consensus which we couldn't previously verify due to
       missing certificates is now verifiable. Fixes bug 8719; bugfix
       on 0.2.0.10-alpha.
-    - Prevent the get_freelists() function from running off the end of
-      the list of freelists if it somehow gets an unrecognized
-      allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by
-      eugenis.
     - We used to always request authority certificates by identity digest,
       meaning we'd get the newest one even when we wanted one with a
       different signing key. Then we would complain about being given
@@ -16,21 +32,22 @@ Changes in version 0.2.4.13-alpha - 2013-06-1?
       wanted. Now we use the "fp-sk/" resource as well as the "fp/"
       resource to request the one we want. Fixes bug 5595; bugfix on
       0.2.0.8-alpha.
-    - Avoid an assertion failure on OpenBSD (and perhaps other BSDs)
-      when an exit connection with optimistic data succeeds immediately
-      rather than returning EINPROGRESS. Fixes bug 9017; bugfix on
-      0.2.3.1-alpha.
     - Follow the socks5 protocol when offering username/password
       authentication. The fix for bug 8117 exposed this bug, and it
       turns out real-world applications like Pidgin do care. Bugfix on
       0.2.3.2-alpha; fixes bug 8879.
-    - Fix a directory authority crash bug when building a consensus
-      using an older consensus as its basis. Fixes bug 8833. Bugfix
-      on 0.2.4.12-alpha.
+    - Prevent failures on Windows Vista and later when rebuilding the
+      microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822;
+      bugfix on 0.2.4.12-alpha.
 
   o Minor bugfixes:
     - Fix an impossible buffer overrun in the AES unit tests. Fixes
       bug 8845; bugfix on 0.2.0.7-alpha. Found by eugenis.
+    - If for some reason we fail to write a microdescriptor while
+      rebuilding the cache, do not let the annotations from that
+      microdescriptor linger in the cache file, and do not let the
+      microdescriptor stay recorded as present in its old location.
+      Fixes bug 9047; bugfix on 0.2.2.6-alpha.
     - Fix a memory leak that would occur whenever a configuration
       option changed. Fixes bug 8718; bugfix on 0.2.3.3-alpha.
     - Paste the description for PathBias parameters from the man
@@ -39,6 +56,11 @@ Changes in version 0.2.4.13-alpha - 2013-06-1?
     - Relays now treat a changed IPv6 ORPort as sufficient reason to
       publish an updated descriptor. Fixes bug 6026; bugfix on
       0.2.4.1-alpha.
+     - When launching a resolve request on behalf of an AF_UNIX control
+       socket, omit the address field of the new entry connection, used in
+       subsequent controller events, rather than letting tor_dup_addr()
+       set it to "<unknown address type>". Fixes bug 8639; bugfix on
+       0.2.4.12-alpha.
 
   o Minor bugfixes (log messages):
     - Fix a scaling issue in the path bias accounting code that
@@ -60,6 +82,10 @@ Changes in version 0.2.4.13-alpha - 2013-06-1?
       bandwidth claims. Resolves ticket 8711.
     - Update to the June 5 2013 Maxmind GeoLite Country database.
 
+  o Removed documentation:
+    - Remove some of the older contents of doc/ as obsolete; move others
+      to torspec.git. Fixes bug 8965.
+
   o Code simplification and refactoring:
     - Avoid using character buffers when constructing most directory
       objects: this approach was unwieldy and error-prone. Instead,
diff --git a/changes/bug8639 b/changes/bug8639
deleted file mode 100644
index 0db5c91429..0000000000
--- a/changes/bug8639
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Normal bugfixes:
-     - When launching a resolve request on behalf of an AF_UNIX control
-       socket, omit the address field of the new entry connection, used in
-       subsequent controller events, rather than letting tor_dup_addr() set
-       it to "<unknown address type>".  Fixes bug 8639.
diff --git a/changes/bug8822 b/changes/bug8822
deleted file mode 100644
index c6787afe06..0000000000
--- a/changes/bug8822
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (windows):
-    - Prevent failures on Windows Vista and later when rebuilding the
-      microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822;
-      bugfix on 0.2.4.12-alpha.
-
diff --git a/changes/bug8965 b/changes/bug8965
deleted file mode 100644
index b5af279632..0000000000
--- a/changes/bug8965
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Removed documentation:
-    - Remove some of the older contents of doc/ as obsolete; move others
-      to torspec.git. Fixes bug 8965.
diff --git a/changes/bug9047 b/changes/bug9047
deleted file mode 100644
index 497f0d3372..0000000000
--- a/changes/bug9047
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - If for some reason we fail to write a microdescriptor while
-      rebuilding the cache, do not let the annotations from that
-      microdescriptor linger in the cache file, and do not let the
-      microdescriptor stay recorded as present in its old location.
-      Fixes bug 9047; bugfix on 0.2.2.6-alpha.
diff --git a/changes/bug9063 b/changes/bug9063
deleted file mode 100644
index dcbecf6179..0000000000
--- a/changes/bug9063
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Normal bugfixes:
-    - Close any circuit that has more cells queued than the spec permits.
-      Fixes bug #9063; bugfix on 0.2.4.12.