summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-12 10:47:12 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-12 10:47:12 -0400
commit9e44ed47acc9805e77c2d6aa562845a71ea9db5c (patch)
treeb610bf9d53a3e4a1df4f6bfab99e2e37bbea005a
parent5ba8ab5a88b36c05986fee1535d4615024974e6d (diff)
downloadtor-9e44ed47acc9805e77c2d6aa562845a71ea9db5c.tar.gz
tor-9e44ed47acc9805e77c2d6aa562845a71ea9db5c.zip
fold more entries into 0.2.4 changelog
-rw-r--r--ChangeLog5
-rw-r--r--changes/geoip-march20153
-rw-r--r--changes/geoip6-march20153
3 files changed, 3 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f3af3d718..4a862ab78c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,8 +25,9 @@ Changes in version 0.2.4.26 - 2015-03-??
it is past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha.
o Minor features (geoip):
- - Update geoip and geoip6 files to the January 7 2015 Maxmind
- GeoLite2 Country database.
+ - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database.
+ - Update geoip6 to the March 3 2015 Maxmind GeoLite2
+ Country database.
Changes in version 0.2.4.25 - 2014-10-20
diff --git a/changes/geoip-march2015 b/changes/geoip-march2015
deleted file mode 100644
index 565781280a..0000000000
--- a/changes/geoip-march2015
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015
deleted file mode 100644
index 9a38c65e62..0000000000
--- a/changes/geoip6-march2015
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database.
-