commit 25f786f7ec97b7915d84f88a549c47524b3910ee Author: Roger Dingledine arma@torproject.org Date: Wed Sep 28 15:41:29 2011 -0400

fold in recent changes entries --- ChangeLog | 11 +++++++++++ changes/bug4115 | 7 ------- changes/bug4124 | 6 ------ 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 6890d2d..6e62e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,15 @@ Changes in version 0.2.3.5-alpha - 2011-09-28 + o Security fixes: + - Bridge relays now do their directory fetches inside Tor TLS + connections, like all the other clients do, rather than connecting + directly to the DirPort like public relays do. Removes another + avenue for enumerating bridges. Fixes part of bug 4115; bugfix + on 0.2.0.35. + - Bridges relays now build circuits for themselves in a more similar + way to how clients build them. Removes another avenue for + enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, + when bridges were introduced. + o Major bugfixes: - Fix a crash bug that could occur when the same microdescriptor was referenced by two node_t objects at once. Fix for bug 4118; bugfix diff --git a/changes/bug4115 b/changes/bug4115 deleted file mode 100644 index 626791a..0000000 --- a/changes/bug4115 +++ /dev/null @@ -1,7 +0,0 @@ - o Security fixes: - - Bridge relays now do their directory fetches inside Tor TLS - connections, like all the other clients do, rather than connecting - directly to the DirPort like public relays do. Removes another - avenue for enumerating bridges. Fixes part of bug 4115; bugfix - on 0.2.0.35. - diff --git a/changes/bug4124 b/changes/bug4124 deleted file mode 100644 index abe93cc..0000000 --- a/changes/bug4124 +++ /dev/null @@ -1,6 +0,0 @@ - o Security fixes: - - Bridges relays now build circuits for themselves in a more similar - way to how clients build them. Removes another avenue for - enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha, - when bridges were introduced. -