aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-24 09:19:22 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-24 09:19:22 -0500
commitb4ead16d57fab6a8294a0bf374bfcdb0d6e02625 (patch)
tree49e95a412aba3ecf7e6845d271a780678e10a178 /changes
parent6218f489509d4bd4a4c96be200565bb6f0906108 (diff)
parent5b55778c86b88329725521d2c93829a9c9ad3501 (diff)
downloadtor-b4ead16d57fab6a8294a0bf374bfcdb0d6e02625.tar.gz
tor-b4ead16d57fab6a8294a0bf374bfcdb0d6e02625.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/geoip-november20143
-rw-r--r--changes/geoip6-november20143
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/geoip-november2014 b/changes/geoip-november2014
new file mode 100644
index 0000000000..52cbeb3e41
--- /dev/null
+++ b/changes/geoip-november2014
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Update geoip to the November 15 2014 Maxmind GeoLite2 Country database.
+
diff --git a/changes/geoip6-november2014 b/changes/geoip6-november2014
new file mode 100644
index 0000000000..e91fcc0d3b
--- /dev/null
+++ b/changes/geoip6-november2014
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Update geoip6 to the November 15 2014 Maxmind GeoLite2 Country database.
+