summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-27 14:18:31 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-27 14:18:31 -0400
commit028cac97c1953f666c89711e31754cec4273b2d0 (patch)
treee02b3e2612cc58604f511ddf5f9ef7ed4a9dd63c /changes
parent63a90f2df4dcd7fff862ca3849f3aa3b1dec7e84 (diff)
parent0ac748353a6089497908fa0817ee4d4726f01158 (diff)
downloadtor-028cac97c1953f666c89711e31754cec4273b2d0.tar.gz
tor-028cac97c1953f666c89711e31754cec4273b2d0.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'changes')
-rw-r--r--changes/geoip-april20153
-rw-r--r--changes/geoip6-april20152
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/geoip-april2015 b/changes/geoip-april2015
new file mode 100644
index 0000000000..7db38ed797
--- /dev/null
+++ b/changes/geoip-april2015
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
+
diff --git a/changes/geoip6-april2015 b/changes/geoip6-april2015
new file mode 100644
index 0000000000..241c9119b6
--- /dev/null
+++ b/changes/geoip6-april2015
@@ -0,0 +1,2 @@
+ o Minor features:
+ - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.