From 2bd2c10fcbb62de8e026cf9ebeb686c541afd03c Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 10 May 2011 23:05:37 -0400 Subject: [PATCH] fold in changes file --- ChangeLog | 2 +- changes/geoip-may2011 | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 changes/geoip-may2011 diff --git a/ChangeLog b/ChangeLog index a2f00d7393..3553e5cf38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,7 +41,7 @@ Changes in version 0.2.1.31 - 2011-05-?? micro-version numbers. Bugfix on 0.2.1.15-rc; fixes bug 2402. o Minor features: - - Update to the April 1 2011 Maxmind GeoLite Country database. + - Update to the May 1 2011 Maxmind GeoLite Country database. Changes in version 0.2.1.30 - 2011-02-23 diff --git a/changes/geoip-may2011 b/changes/geoip-may2011 deleted file mode 100644 index c908f24b45..0000000000 --- a/changes/geoip-may2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the May 1 2011 Maxmind GeoLite Country database. -