[or-cvs] [tor/release-0.2.2] fold in next changes entries

[arma at torproject.org]

commit e5e38e55b33b2cc037c483a38383ab7cfca741fe
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 25 16:30:12 2011 -0500

    fold in next changes entries
---
 ChangeLog       |    9 ++++++++-
 changes/bug2432 |    5 -----
 changes/bug2433 |    5 -----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2c6924..25b3e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,19 @@
 Changes in version 0.2.2.22-alpha - 2011-01-25
-  o Major bugfixes (security):
+  o Major bugfixes:
     - Fix a bounds-checking error that could allow an attacker to
       remotely crash a directory authority. Bugfix on 0.2.1.5-alpha.
       Found by "piebeer".
+    - Don't assert when changing from bridge to relay or vice versa
+      via the controller. The assert happened because we didn't properly
+      initialize our keys in this case. Bugfix on 0.2.2.18-alpha; fixes
+      bug 2433. Reported by bastik.
 
   o Minor features:
     - Adjust our TLS Diffie-Hellman parameters to match those used by
       Apache's mod_ssl.
+    - Provide a log message stating which geoip file we're parsing
+      instead of just stating that we're parsing the geoip file.
+      Implements ticket 2432.
 
   o Minor bugfixes:
     - Check for and reject overly long directory certificates and
diff --git a/changes/bug2432 b/changes/bug2432
deleted file mode 100644
index 407c56b..0000000
--- a/changes/bug2432
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Provide a log message stating which geoip file we're parsing
-      instead of just stating that we're parsing the geoip file.
-      Implements ticket 2432.
-
diff --git a/changes/bug2433 b/changes/bug2433
deleted file mode 100644
index 8e47c4f..0000000
--- a/changes/bug2433
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Don't assert when changing from bridge to relay or vice versa with a controller.
-      The assert happened because we didn't properly initialize our keys in this case.
-      Bugfix on 0.2.2.18, fixes bug 2433. Issue first discovered by bastik.
-