diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:46:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:46:16 -0400 |
commit | 80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f (patch) | |
tree | feb4de19709b663a6d45044f8decb0d17e3ee94d /changes | |
parent | 3149bfc254025485496cb6959d4efb5331612cec (diff) | |
parent | 418b6f8197929aaf7c532d68bd7e11aefcacaded (diff) | |
download | tor-80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f.tar.gz tor-80fb1ef8ba8406f7ed335d7ffd06cdf058cca80f.zip |
Merge remote-tracking branch 'origin/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. + |