commit 78d9af302e63f827aa9bb98251bfb6034944dfe3 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 10:46:18 2015 -0400

fold entries into changelog for 025 --- ChangeLog | 5 +++-- changes/geoip-march2015 | 3 --- changes/geoip6-march2015 | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 46014ac..caf1f4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,8 +36,9 @@ Changes in version 0.2.5.11 - 2015-03-?? get recent bandwidth history after the fix for ticket 13988.

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.

o Minor bugfixes (client, automapping): - Avoid crashing on torrc lines for VirtualAddrNetworkIPv[4|6] when 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. -