aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-05 11:04:59 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-05 11:04:59 -0400
commit91c17ffbd61348e63cac81e90583f0b22b3c17d4 (patch)
tree7723f1f6ebabd65aebb54a161178e9cdcf93276f
parentd6bdec1595751eba397d2ea20318538fcfb9c78a (diff)
parent2e21493a88c264e2df91078c3f14f269854755ef (diff)
downloadtor-91c17ffbd61348e63cac81e90583f0b22b3c17d4.tar.gz
tor-91c17ffbd61348e63cac81e90583f0b22b3c17d4.zip
Merge branch 'maint-0.2.5' into maint-0.2.8
-rw-r--r--changes/geoip-october20172
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/geoip-october2017 b/changes/geoip-october2017
index 547f2ccfd6..11f623e85f 100644
--- a/changes/geoip-october2017
+++ b/changes/geoip-october2017
@@ -1,4 +1,4 @@
- o Minor features:
+ o Minor features (geoip):
- Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2
Country database.