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
commitecc84d87809f4f099772b3cb93626f2b1eaea545 (patch)
treebcb40f28fd44d45d8e20ed8aeeaac36f6b33f72e
parentdb4651469de43c06944fb5e27235a4a2bb4a4f81 (diff)
parent7a4741c2336341449212f635672102d5ba391276 (diff)
downloadtor-ecc84d87809f4f099772b3cb93626f2b1eaea545.tar.gz
tor-ecc84d87809f4f099772b3cb93626f2b1eaea545.zip
Merge branch 'maint-0.3.1' into release-0.3.1
-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.