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
commit43ebe54a24d3210ef037f7e2b67fad9597361bab (patch)
treeb1b8dda8ef10652beb7c15d0def968c670328e7c
parent2984d991653b70fcd561d7d0bd693c46220cec74 (diff)
parent91c17ffbd61348e63cac81e90583f0b22b3c17d4 (diff)
downloadtor-43ebe54a24d3210ef037f7e2b67fad9597361bab.tar.gz
tor-43ebe54a24d3210ef037f7e2b67fad9597361bab.zip
Merge branch 'maint-0.2.8' into maint-0.2.9
-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.