From fcd9248387249d68619734a73860ffaab12b021b Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 11 Mar 2013 14:03:06 -0400 Subject: [PATCH] fold in changes entry --- ChangeLog | 2 +- changes/geoip-mar2013 | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 changes/geoip-mar2013 diff --git a/ChangeLog b/ChangeLog index 74ac36275..1c21c10a4 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 e9cc3981b..000000000 --- a/changes/geoip-mar2013 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the March 6 2013 Maxmind GeoLite Country database. -