[tor-commits] [tor/release-0.3.5] Add geoip entry to 0.3.5.7 changelog

[nickm at torproject.org]

commit f0faee06774fc541d5e679083d4075d95628523b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 7 09:09:50 2019 -0500

    Add geoip entry to 0.3.5.7 changelog
---
 ChangeLog                | 4 ++++
 changes/geoip-2019-01-03 | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90a01a734..aa90ade4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@ Changes in version 0.3.5.7 - 2019-01-07
     - When possible, place our warning flags in a separate file, to
       avoid flooding verbose build logs. Closes ticket 28924.
 
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the January 3 2019 Maxmind GeoLite2
+      Country database. Closes ticket 29012.
+
   o Minor features (OpenSSL bug workaround):
     - Work around a bug in OpenSSL 1.1.1a, which prevented the TLS 1.3
       key export function from handling long labels. When this bug is
diff --git a/changes/geoip-2019-01-03 b/changes/geoip-2019-01-03
deleted file mode 100644
index 27ffb7f46..000000000
--- a/changes/geoip-2019-01-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the January 3 2019 Maxmind GeoLite2
-      Country database. Closes ticket 29012.
-