summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-01 11:33:36 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-01 11:33:36 -0400
commit83389502ee6314658bcddd324c3652543b27da6b (patch)
treeaea5d2ed975bb0e8eea0422c00ed7cbfe34bd427
parentc1b411109e857ba493a34a5ba8f8bad196ca0f26 (diff)
downloadtor-83389502ee6314658bcddd324c3652543b27da6b.tar.gz
tor-83389502ee6314658bcddd324c3652543b27da6b.zip
Fold in the geoip changes filetor-0.3.1.5-alpha
-rw-r--r--ChangeLog4
-rw-r--r--changes/geoip-july20174
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8825bef6b4..dfa1ae08b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,10 @@ Changes in version 0.3.1.5-alpha - 2017-08-01
operators should leave it unchanged. Helps to work around
bug 22883.
+ o Minor features (geoip):
+ - Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
+ Country database.
+
o Minor features (relay, performance):
- Always start relays with at least two worker threads, to prevent
priority inversion on slow tasks. Part of the fix for bug 22883.
diff --git a/changes/geoip-july2017 b/changes/geoip-july2017
deleted file mode 100644
index ed10369f1b..0000000000
--- a/changes/geoip-july2017
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features:
- - Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
- Country database.
-