Update the release-0.2.1 changelog while I am at it

4 files changed, 12 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ff5326fb5..3e757857ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes in version 0.2.1.32 - 201?-??-??
+
+  o Major bugfixes (also included in 0.2.2.x):
+    - Correctly sanity-check that we don't underflow on a memory
+      allocation (and then assert) for hidden service introduction
+      point decryption. Bug discovered by Dan Rosenberg. Fixes bug 4410;
+      bugfix on 0.2.1.5-alpha.
+
+  o Minor features:
+    - Update to the December 6 2011 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.1.31 - 2011-10-26
   Tor 0.2.1.31 backports important security and privacy fixes for
   oldstable. This release is intended only for package maintainers and
diff --git a/changes/bug4410 b/changes/bug4410
deleted file mode 100644
index f42893adf4..0000000000
--- a/changes/bug4410
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Correctly sanity-check that we don't underflow on a memory allocation
-      for introduction point decryption. Bug discovered by Dan Rosenberg.
-      Fixes bug 4410; bugfix on 0.2.1.5-alpha.
-
diff --git a/changes/geoip-december2011 b/changes/geoip-december2011
deleted file mode 100644
index 82a708de62..0000000000
--- a/changes/geoip-december2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the December 6 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-november2011 b/changes/geoip-november2011
deleted file mode 100644
index 3aa8dc05c2..0000000000
--- a/changes/geoip-november2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the November 1 2011 Maxmind GeoLite Country database.
-