commit 9e44ed47acc9805e77c2d6aa562845a71ea9db5c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 12 10:47:12 2015 -0400 fold more entries into 0.2.4 changelog --- ChangeLog | 5 +++-- changes/geoip-march2015 | 3 --- changes/geoip6-march2015 | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f3af3d..4a862ab 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 5657812..0000000 --- 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 9a38c65..0000000 --- a/changes/geoip6-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. -