[tor-commits] [tor/release-0.2.2] retroactively add a changelog entry

[arma at torproject.org]

commit 645920542684c28d24b70529486210889434bcc9
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Apr 8 16:43:10 2011 -0400

    retroactively add a changelog entry
---
 ChangeLog             |    1 +
 changes/geoip-apr2011 |    3 ---
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c9ccc3..70afe71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@ Changes in version 0.2.2.24-alpha - 2011-04-08
     - Use computed circuit-build timeouts to decide when to launch
       parallel introduction circuits for hidden services. (Previously,
       we would retry after 15 seconds.)
+    - Update to the April 1 2011 Maxmind GeoLite Country database.
 
   o Packaging fixes:
     - Create the /var/run/tor directory on startup on OpenSUSE if it is
diff --git a/changes/geoip-apr2011 b/changes/geoip-apr2011
deleted file mode 100644
index c38f8ae..0000000
--- a/changes/geoip-apr2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the April 1 2011 Maxmind GeoLite Country database.
-