commit 2bd2c10fcbb62de8e026cf9ebeb686c541afd03c Author: Roger Dingledine arma@torproject.org Date: Tue May 10 23:05:37 2011 -0400

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

diff --git a/ChangeLog b/ChangeLog index a2f00d7..3553e5c 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 c908f24..0000000 --- a/changes/geoip-may2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the May 1 2011 Maxmind GeoLite Country database. -