fold in new changes files

diff --git a/ChangeLog b/ChangeLog
index 8f52364407861bcc2552bd6e8f3c4cfcfc1d4dbb..c9b498e6da0d55a5fe300f6f9c43de2d5ced0427 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes in version 0.2.2.27-beta - 2011-05-18
+  o Major bugfixes:
+    - Fix a crash bug when changing bridges in a running Tor process.
+      Fixes bug 3213; bugfix on 0.2.2.26-beta.
+    - When the controller configures a new bridge, don't wait 10 to 60
+      seconds before trying to fetch its descriptor. Bugfix on
+      0.2.0.3-alpha; fixes bug 3198 (suggested by 2355).
+
+  o Minor bugfixes:
+    - Require that onion keys have exponent 65537 in microdescriptors too.
+      Fixes more of bug 3207; bugfix on 0.2.2.25-alpha.
+    - 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.
+
+
 Changes in version 0.2.2.26-beta - 2011-05-17
   Tor 0.2.2.26-beta fixes a variety of potential privacy problems. It
   also introduces a new "socksport auto" approach that should make it

diff --git a/changes/bug2752 b/changes/bug2752
deleted file mode 100644 (file)
index b872d33..0000000
--- a/changes/bug2752
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - 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.
-

diff --git a/changes/bug3198 b/changes/bug3198
deleted file mode 100644 (file)
index 29c1685..0000000
--- a/changes/bug3198
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - When we configure a new bridge via the controller, don't wait up
-      to ten seconds before trying to fetch its descriptor. Bugfix on
-      0.2.0.3-alpha; fixes bug 3198 (suggested by 2355).

diff --git a/changes/bug3207 b/changes/bug3207
deleted file mode 100644 (file)
index 65a7dac..0000000
--- a/changes/bug3207
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Require that onion keys have exponent 65537 in microdescriptors too.
-      Fixes part of bug 3207; bugfix on 0.2.2.25-alpha
-

diff --git a/changes/bug3213 b/changes/bug3213
deleted file mode 100644 (file)
index ab7de2d..0000000
--- a/changes/bug3213
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Fix a crash bug when changing bridges in a running Tor process.
-      Fixes bug 3213; bugfix on 0.2.2.26-beta.
-