commit 960f62bd82c249b456a0aa2e1ae62f68c754aacb Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 14 16:03:58 2011 -0500

Start a section for the 0.2.3.10-alpha changelog --- ChangeLog | 24 ++++++++++++++++++++++++ changes/bug4655 | 10 ---------- changes/bug4691 | 4 ---- changes/bug4702 | 6 ------ changes/geoip-december2011 | 3 --- 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog index e0182af..2fe0711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +Changes in version 0.2.3.10-alpha - 201?-??-?? + + + o Minor bugfixes: + - If we can't attach streams to a rendezvous circuit when we + finish connecting to a hidden service, clear the rendezvous + circuit's stream-isolation state and try to attach streams + again. Previously, we cleared rendezvous circuits' isolation + state either too early (if they were freshly built) or not at + all (if they had been built earlier and were cannibalized). + Bugfix on 0.2.3.3-alpha; fixes bug 4655. + - Fix compilation of the libnatpmp helper on non-Windows. Bugfix on + 0.2.3.9-alpha; fixes bug 4691. Reported by Anthony G. Basile. + + o Minor bugfixes: + - Fix an assertion failure when a relay with accounting enabled + starts up while dormant. Fixes bug 4702; bugfix on + 0.2.3.9-alpha. + + o Minor features: + - Update to the December 6 2011 Maxmind GeoLite Country database. + + + Changes in version 0.2.3.9-alpha - 2011-12-08 Tor 0.2.3.9-alpha introduces initial IPv6 support for bridges, adds a "DisableNetwork" security feature that bundles can use to avoid diff --git a/changes/bug4655 b/changes/bug4655 deleted file mode 100644 index b91d871..0000000 --- a/changes/bug4655 +++ /dev/null @@ -1,10 +0,0 @@ - o Minor bugfixes: - - - If we can't attach streams to a rendezvous circuit when we - finish connecting to a hidden service, clear the rendezvous - circuit's stream-isolation state and try to attach streams - again. Previously, we cleared rendezvous circuits' isolation - state either too early (if they were freshly built) or not at - all (if they had been built earlier and were cannibalized). - Bugfix on 0.2.3.3-alpha; fixes bug 4655. - diff --git a/changes/bug4691 b/changes/bug4691 deleted file mode 100644 index 124b8f8..0000000 --- a/changes/bug4691 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Fix compilation of the libnatpmp helper on non-Windows. Bugfix on - 0.2.3.9-alpha; fixes bug 4691. Reported by Anthony G. Basile. - diff --git a/changes/bug4702 b/changes/bug4702 deleted file mode 100644 index dcd3bfc..0000000 --- a/changes/bug4702 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - - Fix an assertion failure when a relay with accounting enabled - starts up while dormant. Fixes bug 4702; bugfix on - 0.2.3.9-alpha. - diff --git a/changes/geoip-december2011 b/changes/geoip-december2011 deleted file mode 100644 index 82a708d..0000000 --- a/changes/geoip-december2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the December 6 2011 Maxmind GeoLite Country database. -