aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-17 21:20:08 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-17 21:20:08 -0400
commit6ade302da9a31265ffc861870adb20947eef15a7 (patch)
treef73f4dac3f9d34ea452f60876ea2e3db8eb04f3c
parent16c7b05ac6238697128306b5b72cdc3155d51b4e (diff)
downloadtor-6ade302da9a31265ffc861870adb20947eef15a7.tar.gz
tor-6ade302da9a31265ffc861870adb20947eef15a7.zip
fold in one more changes file
-rw-r--r--ChangeLog5
-rw-r--r--changes/bug32006
2 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c9b498e6da..483c4b98f6 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 a80d51633e..0000000000
--- 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.