[tor-commits] [tor/release-0.2.4] fold in changes entry

[arma at torproject.org]

commit fcd9248387249d68619734a73860ffaab12b021b
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Mar 11 14:03:06 2013 -0400

    fold in changes entry
---
 ChangeLog             |    2 +-
 changes/geoip-mar2013 |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74ac362..1c21c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,7 +69,7 @@ Changes in version 0.2.4.11-alpha - 2013-03-11
       we could wind up in a situation where users with such backends would
       be distinguishable from users without. Fixes bug 8121; bugfix on
       0.2.4.8-alpha.
-    - Update to the February 6 2013 Maxmind GeoLite Country database.
+    - Update to the March 6 2013 Maxmind GeoLite Country database.
 
   o Minor bugfixes (clients):
     - When we receive a RELAY_END cell with the reason DONE, or with no
diff --git a/changes/geoip-mar2013 b/changes/geoip-mar2013
deleted file mode 100644
index e9cc398..0000000
--- a/changes/geoip-mar2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the March 6 2013 Maxmind GeoLite Country database.
-