diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:43:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:43:04 -0400 |
| commit | fd082c394bf392cab0c586313a82d5bb3bbd6139 (patch) | |
| tree | b0aa885278b7880ff1b230bae85d1096a081f42b /changes | |
| parent | 75388f67c07d1a48c6fb9c5d1c4441ab66b644c0 (diff) | |
| parent | fde4199e1caa094965da0904955ad34748db1e30 (diff) | |
| download | tor-fd082c394bf392cab0c586313a82d5bb3bbd6139.tar.gz tor-fd082c394bf392cab0c586313a82d5bb3bbd6139.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
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. + |