[tor-commits] [tor/release-0.3.1] Fold in the geoip changes file

[nickm at torproject.org]

commit 83389502ee6314658bcddd324c3652543b27da6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:33:36 2017 -0400

    Fold in the geoip changes file
---
 ChangeLog              | 4 ++++
 changes/geoip-july2017 | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8825bef6b..dfa1ae08b 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 ed10369f1..000000000
--- 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.
-