diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 10:46:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 10:46:18 -0400 |
| commit | 78d9af302e63f827aa9bb98251bfb6034944dfe3 (patch) | |
| tree | 666efd32fe4363f4c6ba61a66b6fa5e45cd8fc26 | |
| parent | a286fbd711a6fb197cb95150be57edae3034ca43 (diff) | |
| download | tor-78d9af302e63f827aa9bb98251bfb6034944dfe3.tar.gz tor-78d9af302e63f827aa9bb98251bfb6034944dfe3.zip | |
fold entries into changelog for 025
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | changes/geoip-march2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-march2015 | 3 |
3 files changed, 3 insertions, 8 deletions
@@ -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 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. - |