summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-07-21 14:30:27 -0400
committerNick Mathewson <nickm@torproject.org>2014-07-21 14:30:27 -0400
commit641c1584f7be8de88d3c58eae96c5c022a4870d1 (patch)
tree8e0940e620d6adcaedaeff3d26a03d3ae7a76676 /changes
parente7e92fb2f9e45c18ac23c90efe2eb32cf3f4a953 (diff)
parente0aa88d10662d2ea7cc54f0fd53f5789fdd9a3da (diff)
downloadtor-641c1584f7be8de88d3c58eae96c5c022a4870d1.tar.gz
tor-641c1584f7be8de88d3c58eae96c5c022a4870d1.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/geoip-july20143
-rw-r--r--changes/geoip6-july20142
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/geoip-july2014 b/changes/geoip-july2014
new file mode 100644
index 0000000000..a0523ecac9
--- /dev/null
+++ b/changes/geoip-july2014
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.
+
diff --git a/changes/geoip6-july2014 b/changes/geoip6-july2014
new file mode 100644
index 0000000000..155788ef88
--- /dev/null
+++ b/changes/geoip6-july2014
@@ -0,0 +1,2 @@
+ o Minor features:
+ - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.