diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:40 -0400 |
| commit | fa7ce6d3be62061de73176ffb939aa8d353d4014 (patch) | |
| tree | 1b24dad14a48fa2b2eafe3c579028a46c4891cbe /changes | |
| parent | 4056c61608f1ede0da56559cb7e56ec2087dc659 (diff) | |
| parent | b45f0f8fb9b11effcd48159c078f09a3fbc04b11 (diff) | |
| download | tor-fa7ce6d3be62061de73176ffb939aa8d353d4014.tar.gz tor-fa7ce6d3be62061de73176ffb939aa8d353d4014.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-august2014 | 3 | ||||
| -rw-r--r-- | changes/geoip6-august2014 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-august2014 b/changes/geoip-august2014 new file mode 100644 index 0000000000..90d8ecb300 --- /dev/null +++ b/changes/geoip-august2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-august2014 b/changes/geoip6-august2014 new file mode 100644 index 0000000000..7e7c9a975d --- /dev/null +++ b/changes/geoip6-august2014 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database. + |