prepare for our emergency openssl fix release

diff --git a/ChangeLog b/ChangeLog
index 0bdecd0a8468206baf2e8210f0588bd1b2ba8ead..6fb6ca38255887fd5623269a61dd2dbce03f3aae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Changes in version 0.2.2.19-alpha - 2010-11-21
+  o Major bugfixes:
+    - Resolve an incompatibility with openssl 0.9.8p and openssl 1.0.0b:
+      No longer set the tlsext_host_name extension on server SSL objects;
+      but continue to set it on client SSL objects. Our goal in setting
+      it was to imitate a browser, not a vhosting server. Fixes bug 2204;
+      bugfix on 0.2.1.1-alpha.
+
+  o Minor bugfixes:
+    - Try harder not to exceed the maximum length of 50 KB when writing
+      statistics to extra-info descriptors. This bug was triggered by very
+      fast relays reporting exit-port, entry, and dirreq statistics.
+      Reported by Olaf Selke. Bugfix on 0.2.2.1-alpha. Fixes bug 2183.
+    - Publish a router descriptor even if generating an extra-info
+      descriptor fails. Previously we would not publish a router
+      descriptor without an extra-info descriptor; this can cause fast
+      exit relays collecting exit-port statistics to drop from the
+      consensus. Bugfix on 0.1.2.9-rc; fixes bug 2195.
+
+
 Changes in version 0.2.2.18-alpha - 2010-11-16
   o Major bugfixes:
     - Do even more to reject (and not just ignore) annotations on

diff --git a/changes/bug2183 b/changes/bug2183
deleted file mode 100644 (file)
index 01a8d76..0000000
--- a/changes/bug2183
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Try harder not to exceed the maximum length of 50 KB when writing
-      statistics to extra-info descriptors. This bug was triggered by very
-      fast relays reporting exit-port, entry, and dirreq statistics.
-      Reported by Olaf Selke. Bugfix on 0.2.2.1-alpha. Fixes bug 2183.
-

diff --git a/changes/bug2195 b/changes/bug2195
deleted file mode 100644 (file)
index 1724fd0..0000000
--- a/changes/bug2195
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes
-    - Publish a router descriptor even if generating an extra-info
-      descriptor fails.  Previously we would not publish a router
-      descriptor without an extra-info descriptor; this can cause fast
-      exit relays collecting exit-port statistics to drop from the
-      consensus.  Bugfix on 0.1.2.9-rc; fixes bug 2195.
-

diff --git a/changes/fix2204 b/changes/fix2204
deleted file mode 100644 (file)
index fb2771a..0000000
--- a/changes/fix2204
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes
-    - Do not set the tlsext_host_name extension on server SSL objects;
-      only on client SSL objects.  We set it to immitate a browser, not a
-      vhosting server. This resolves an incompatibility with openssl 0.9.8p
-      and openssl 1.0.0b.  Fixes bug 2204; bugfix on 0.2.1.1-alpha.
-
-