diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-09 16:25:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-09 16:25:11 -0400 |
| commit | 7c9be64e1af05aa1fdac894ffe9ef98f80091d57 (patch) | |
| tree | 36281a8c8bbe3e6e729a54a14cc0462f89ceb2f6 /changes | |
| parent | c066f2d30b36f242867093ae33cd61a6ecd310f1 (diff) | |
| parent | 306f2f0eff1b7d1c4bbee8b600a962d537c566f3 (diff) | |
| download | tor-7c9be64e1af05aa1fdac894ffe9ef98f80091d57.tar.gz tor-7c9be64e1af05aa1fdac894ffe9ef98f80091d57.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/geoip-march2015 | 3 | ||||
| -rw-r--r-- | changes/geoip6-march2015 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-march2015 b/changes/geoip-march2015 new file mode 100644 index 0000000000..565781280a --- /dev/null +++ b/changes/geoip-march2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. + diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015 new file mode 100644 index 0000000000..9a38c65e62 --- /dev/null +++ b/changes/geoip6-march2015 @@ -0,0 +1,3 @@ + o Minor features: + - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. + |