diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:43:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:43:17 -0400 |
| commit | 418b6f8197929aaf7c532d68bd7e11aefcacaded (patch) | |
| tree | 66e3c2baa027a5e7563aa354a10ed1becd721ab8 /changes | |
| parent | 1c1d71fe1adf9202a1e0c9e4aa35c2cb7ce1fe7b (diff) | |
| parent | fd082c394bf392cab0c586313a82d5bb3bbd6139 (diff) | |
| download | tor-418b6f8197929aaf7c532d68bd7e11aefcacaded.tar.gz tor-418b6f8197929aaf7c532d68bd7e11aefcacaded.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-june2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-june2015 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-june2015 b/changes/geoip-june2015 new file mode 100644 index 0000000000..9d6cd3658b --- /dev/null +++ b/changes/geoip-june2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-june2015 b/changes/geoip6-june2015 new file mode 100644 index 0000000000..527dbff53b --- /dev/null +++ b/changes/geoip6-june2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database. + |