[tor-commits] [tor/release-0.3.5] changelog: new geoip entry.

[nickm at torproject.org]

commit e0920a3f63295eff9436ca96084490c3172ec266
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:04:19 2019 -0500

    changelog: new geoip entry.
---
 ChangeLog                | 6 +++---
 changes/geoip-2019-12-03 | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8f77ab17..d17070b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,9 +115,9 @@ Changes in version 0.3.5.9 - 2019-12-??
       list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
       in June 2019. Closes ticket 28795.
 
-  o Minor features (geoip, backport from 0.4.2.4-rc):
-    - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-      Country database. Closes ticket 32440.
+  o Minor features (geoip, backport from 0.4.2.5):
+    - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+      Country database. Closes ticket 32685.
 
   o Minor features (NSS, diagnostic, backport from 0.4.0.4-rc):
     - Try to log an error from NSS (if there is any) and a more useful
diff --git a/changes/geoip-2019-12-03 b/changes/geoip-2019-12-03
deleted file mode 100644
index ea62b6ee8..000000000
--- a/changes/geoip-2019-12-03
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
-      Country database. Closes ticket 32685.
-