commit 6ade302da9a31265ffc861870adb20947eef15a7 Author: Roger Dingledine arma@torproject.org Date: Tue May 17 21:20:08 2011 -0400

fold in one more changes file --- ChangeLog | 5 +++++ changes/bug3200 | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index c9b498e..483c4b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ Changes in version 0.2.2.27-beta - 2011-05-18 - Tor used to limit HttpProxyAuthenticator values to 48 characters. Changed the limit to 512 characters by removing base64 newlines. Fixes bug 2752. Fix by Michael Yakubovich. + - When a client starts or stops using bridges, never use a circuit + that was built before the configuration change. This behavior could + put at risk a user who uses bridges to ensure that her traffic + only goes to the chosen addresses. Bugfix on 0.2.0.3-alpha; fixes + bug 3200.

Changes in version 0.2.2.26-beta - 2011-05-17 diff --git a/changes/bug3200 b/changes/bug3200 deleted file mode 100644 index a80d516..0000000 --- a/changes/bug3200 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - When a client starts or stops using bridges, never use a circuit - that was built before the configuration change. This behavior could - put at risk a user who uses bridges to ensure that her traffic - only goes to the chosen addresses. Bugfix on 0.2.0.3-alpha; fixes - bug 3200.