aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-10 23:05:37 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-10 23:05:37 -0400
commit2bd2c10fcbb62de8e026cf9ebeb686c541afd03c (patch)
tree60b44947bb75edc40fe63b51edc04856d3a83fb3
parentc783b828cacbb14d784cc6e5fa4acf3e6079da0a (diff)
downloadtor-2bd2c10fcbb62de8e026cf9ebeb686c541afd03c.tar.gz
tor-2bd2c10fcbb62de8e026cf9ebeb686c541afd03c.zip
fold in changes file
-rw-r--r--ChangeLog2
-rw-r--r--changes/geoip-may20113
2 files changed, 1 insertions, 4 deletions
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.
-