diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-27 14:18:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-27 14:18:16 -0400 |
| commit | 0ac748353a6089497908fa0817ee4d4726f01158 (patch) | |
| tree | 8c972530f95cf2c0e8746684c7d42fbd257ba0a5 /changes | |
| parent | f620b8f03286de641329cd9ae2027f3628a7d2a1 (diff) | |
| parent | 6c7720ed49623f649aa6280606c129ee153b04ed (diff) | |
| download | tor-0ac748353a6089497908fa0817ee4d4726f01158.tar.gz tor-0ac748353a6089497908fa0817ee4d4726f01158.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-april2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-april2015 | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/geoip-april2015 b/changes/geoip-april2015 new file mode 100644 index 0000000000..7db38ed797 --- /dev/null +++ b/changes/geoip-april2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-april2015 b/changes/geoip6-april2015 new file mode 100644 index 0000000000..241c9119b6 --- /dev/null +++ b/changes/geoip6-april2015 @@ -0,0 +1,2 @@ + o Minor features: + - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database. |