Fold in the geoip changes file

2017-08-01 11:33:36 -04:00 · 2017-08-01 11:33:36 -04:00 · 83389502ee
parent c1b411109e
commit 83389502ee
2 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -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.
--- a/changes/geoip-july2017
+++ b/changes/geoip-july2017
@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
-      Country database.
-