commit e26f5553ecf7563aeee7c203b36248f445f5d812 Author: Roger Dingledine arma@torproject.org Date: Mon Nov 7 15:22:23 2011 -0500

fold in changes files --- ChangeLog | 33 +++++++++++++++++++++++++++++++++ changes/bridgeauth_crash | 4 ---- changes/bug4366 | 4 ---- changes/bug4383 | 5 ----- changes/bug4410 | 5 ----- changes/bug4411 | 10 ---------- changes/bug4424 | 6 ------ changes/win-bundle-path | 4 ---- 8 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 4c97e22..a67ed7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +Changes in version 0.2.3.8-alpha - 2011-11-?? + o Major bugfixes: + - Correctly sanity-check that we don't underflow on a memory + allocation (and then assert) for hidden service introduction + point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410; + bugfix on 0.2.1.5-alpha. + - Fix a rare assertion failure when checking whether a v0 hidden + service descriptor has any usable introduction points left, and + we don't have enough information to build a circuit to the first + intro point named in the descriptor. The HS client code in + 0.2.3.x no longer uses v0 HS descriptors, but this assertion can + trigger on (and crash) v0 HS authorities. Fixes bug 4411. + Bugfix on 0.2.3.1-alpha; diagnosed by frosty_un. + - Don't crash when we, as the bridge authority, are asked for our own + descriptor. Bugfix on 0.2.3.7-alpha, reported by Lucky Green. + + o Minor bugfixes: + - Fix a memory leak when we check whether a hidden service + descriptor has any usable introduction points left. Fixes bug + 4424. Bugfix on 0.2.2.25-alpha. + - Fix a memory leak in launch_direct_bridge_descriptor_fetch() that + occurred when a client tried to fetch a descriptor for a bridge + in ExcludeNodes. Fixes #4383; bugfix on 0.2.2.25-alpha. + + o Packaging changes: + - Make it easier to automate expert package builds on Windows + by removing an absolute path from makensis.exe command. + + o Code simplifications and refactoring: + - Remove some redundant #include directives throughout the code. + Patch from Andrea Gelmini. + + Changes in version 0.2.3.7-alpha - 2011-10-30 Tor 0.2.3.7-alpha fixes a crash bug in 0.2.3.6-alpha introduced by the new v3 handshake. It also resolves yet another bridge address diff --git a/changes/bridgeauth_crash b/changes/bridgeauth_crash deleted file mode 100644 index 74b9d03..0000000 --- a/changes/bridgeauth_crash +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Don't crash when we, as the bridge authority, are asked for our own - descriptor. Bugfix on 0.2.3.7-alpha, reported by Lucky. - diff --git a/changes/bug4366 b/changes/bug4366 deleted file mode 100644 index c31646f..0000000 --- a/changes/bug4366 +++ /dev/null @@ -1,4 +0,0 @@ - o Code simplifications and refactoring: - - Remove some redundant #include directives throughout the code. - Patch from Andrea Gelmini. - diff --git a/changes/bug4383 b/changes/bug4383 deleted file mode 100644 index e618b8c..0000000 --- a/changes/bug4383 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix a memleak in launch_direct_bridge_descriptor_fetch() that - occured when a client tried to fetch a descriptor for a bridge - in ExcludeNodes. Fixes #4383; bugfix on 0.2.2.25-alpha. - diff --git a/changes/bug4410 b/changes/bug4410 deleted file mode 100644 index f42893a..0000000 --- a/changes/bug4410 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Correctly sanity-check that we don't underflow on a memory allocation - for introduction point decryption. Bug discovered by Dan Rosenberg. - Fixes bug 4410; bugfix on 0.2.1.5-alpha. - diff --git a/changes/bug4411 b/changes/bug4411 deleted file mode 100644 index 1273d02..0000000 --- a/changes/bug4411 +++ /dev/null @@ -1,10 +0,0 @@ - o Major bugfixes - - - Fix a rare assertion failure when checking whether a v0 hidden - service descriptor has any usable introduction points left, and - we don't have enough information to build a circuit to the first - intro point named in the descriptor. The HS client code in - 0.2.3.x no longer uses v0 HS descriptors, but this assertion can - trigger on (and crash) v0 HS authorities. Fixes bug 4411. - Bugfix on 0.2.3.1-alpha; diagnosed by frosty_un. - diff --git a/changes/bug4424 b/changes/bug4424 deleted file mode 100644 index 443625d..0000000 --- a/changes/bug4424 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes - - - Don't leak memory when we check whether a hidden service - descriptor has any usable introduction points left. Fixes bug - 4424. Bugfix on 0.2.2.25-alpha. - diff --git a/changes/win-bundle-path b/changes/win-bundle-path deleted file mode 100644 index 32ff514..0000000 --- a/changes/win-bundle-path +++ /dev/null @@ -1,4 +0,0 @@ - o Packaging changes: - - Remove absolute path from makensis.exe command to build Tor expert bundle - in order to make it easier to automate package builds -