fold in one more changes file

diff --git a/ChangeLog b/ChangeLog
index c9b498e6da0d55a5fe300f6f9c43de2d5ced0427..483c4b98f6c68529889f36d1ffb240bd4703e358 100644 (file)
--- 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 (file)
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.