fold in latest changes entries

ChangeLog

@@ -11,35 +11,30 @@ Changes in version 0.2.3.13-alpha - 2012-03-1?
       a client's bridges collude to restrict the exit nodes that the
       client knows about. Fixes bug 5343.
 
-  o Major bugfixes:
+  o Major bugfixes (on Tor 0.2.3.x):
-    - Fix a relay-side pluggable transports bug where managed proxies were
-      unreachable from the Internet, because Tor asked them to bind on
-      localhost. Fixes bug 4725; bugfix on 0.2.3.9-alpha.
-    - Resume building with nat-pmp support. Fixes bug 4955; bugfix on
-      0.2.3.11-alpha. Reported by Anthony G. Basile.
     - Avoid an assert when managed proxies like obfsproxy are configured,
       and we receive HUP signals or setconf attempts too rapidly. This
       situation happens most commonly when Vidalia tries to attach to
       Tor or tries to configure the Tor it's attached to. Fixes bug 5084;
       bugfix on 0.2.3.6-alpha.
+    - Fix a relay-side pluggable transports bug where managed proxies were
+      unreachable from the Internet, because Tor asked them to bind on
+      localhost. Fixes bug 4725; bugfix on 0.2.3.9-alpha.
     - Stop discarding command-line arguments when TestingTorNetwork
       is set. Discovered by Kevin Bauer. Fixes bug 5373; bugfix on
       0.2.3.9-alpha, where task 4552 added support for two layers of
       torrc files.
+    - Resume allowing the unit tests to run in gdb. This was accidentally
+      made impossible when the DisableDebuggerAttachment option was
+      introduced. Fixes bug 5448; bugfix on 0.2.3.9-alpha.
+    - Resume building with nat-pmp support. Fixes bug 4955; bugfix on
+      0.2.3.11-alpha. Reported by Anthony G. Basile.
 
-  o Minor bugfixes:
+  o Minor bugfixes (on 0.2.2.x and earlier):
-    - On a failed pipe() call, don't leak file descriptors. Fixes bug
+    - Ensure we don't cannibalize circuits that are longer than three hops
-      4296; bugfix on 0.2.3.1-alpha.
+      already, so we don't end up making circuits with 5 or more
-    - Spec conformance: on a v3 handshake, do not send a NETINFO cell
+      hops. Patch contributed by wanoskarnet. Fixes bug 5231; bugfix on
-      until after we have received a CERTS cell. Fixes bug 4361; bugfix
+      0.1.0.1-rc which introduced cannibalization.
-      on 0.2.3.6-alpha. Patch by "frosty".
-    - When binding to an IPv6 address, set the IPV6_V6ONLY socket
-      option, so that the IP stack doesn't decide to use it for IPv4
-      too. Fixes bug 4760; bugfix on 0.2.3.9-alpha.
-    - Directory caches no longer refuse to clean out descriptors when
-      because of missing v2 networkstatus documents, unless they're
-      actually trying to retrieve v2 networkstatus documents. Fixes bug
-      4838; bugfix on 0.2.2.26-beta. Patch by Daniel Bryg.
     - Detect and reject certain misformed escape sequences in
       configuration values. Previously, these values would cause us
       to crash if received in a torrc file or over an (authenticated)
@@ -48,6 +43,26 @@ Changes in version 0.2.3.13-alpha - 2012-03-1?
       noted that it allows a post-authentication heap overflow. Patch
       by "flupzor". Fixes bugs 5090 and 5402 (CVE 2012-1668); bugfix
       on 0.2.0.16-alpha.
+    - Fix a compile warning when using the --enable-openbsd-malloc
+      configure option. Fixes bug 5340; bugfix on 0.2.0.20-rc.
+    - Directory caches no longer refuse to clean out descriptors when
+      because of missing v2 networkstatus documents, unless they're
+      actually trying to retrieve v2 networkstatus documents. Fixes bug
+      4838; bugfix on 0.2.2.26-beta. Patch by Daniel Bryg.
+    - Update to the latest version of the tinytest unit testing framework.
+      This includes a couple of bugfixes that can be relevant for
+      running forked unit tests on Windows, and a removal of all reserved
+      identifiers.
+
+  o Minor bugfixes (on 0.2.3.x):
+    - On a failed pipe() call, don't leak file descriptors. Fixes bug
+      4296; bugfix on 0.2.3.1-alpha.
+    - Spec conformance: on a v3 handshake, do not send a NETINFO cell
+      until after we have received a CERTS cell. Fixes bug 4361; bugfix
+      on 0.2.3.6-alpha. Patch by "frosty".
+    - When binding to an IPv6 address, set the IPV6_V6ONLY socket
+      option, so that the IP stack doesn't decide to use it for IPv4
+      too. Fixes bug 4760; bugfix on 0.2.3.9-alpha.
     - Ensure that variables set in Tor's environment cannot override
       environment variables which Tor tries to pass to a managed
       pluggable-transport proxy. Previously, Tor would pass every
@@ -56,19 +71,10 @@ Changes in version 0.2.3.13-alpha - 2012-03-1?
       inherited environment variables would override those which Tor
       tried to explicitly set. Bugfix on 0.2.3.12-alpha for most
       Unixoid systems; bugfix on 0.2.3.9-alpha for Windows.
-    - Ensure we don't cannibalize circuits that are longer than three hops
-      already, so we don't end up making circuits with 5 or more
-      hops. Patch contributed by wanoskarnet. Fixes bug 5231; bugfix on
-      0.1.0.1-rc which introduced cannibalization.
-    - Fix a compile warning when using the --enable-openbsd-malloc
-      configure option. Fixes bug 5340; bugfix on 0.2.0.20-rc.
-    - Update to the latest version of the tinytest unit testing framework.
-      This includes a couple of bugfixes that can be relevant for
-      running forked unit tests on Windows, and a removal of all reserved
-      identifiers.
 
   o Minor features:
     - A wide variety of new unit tests by Esteban Manchado Velázquez.
+    - Shorten links in the tor-exit-notice file. Patch by Christian Kujau.
     - Update to the March 6 2012 Maxmind GeoLite Country database.
 
 

changes/bug5448

@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Allow running the unit tests in gdb again. This was accidentally made
-      impossible when the DisableDebuggerAttachment option was introduced.
-      Fixes bug 5448; bugfix on 0.2.3.9-alpha.
-

changes/ticket5410

@@ -1,3 +0,0 @@
-  o Minor features:
-    - Shorten links in the tor-exit-notice file. Patch by Christian Kujau.
-