[tor-commits] [tor/release-0.4.2] update changelog for new geoip entry.

[nickm@xxxxxxxxxxxxxx]

commit ad9bcbfc87d1c727fda51c0a32ad9a5189ad8f3e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 6 16:06:01 2019 -0500

    update changelog for new geoip entry.
---
 ChangeLog                | 4 ++++
 ReleaseNotes             | 6 ++----
 changes/geoip-2019-12-03 | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbefe58d0..fa66eacc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 Changes in version 0.4.2.5 - 2019-12-??
   Blurb blurb.
 
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+      Country database. Closes ticket 32685.
+
   o Testing:
     - Require C99 standards-conforming code in Travis CI, but allow GNU
       gcc extensions. Also activates clang's -Wtypedef-redefinition
diff --git a/ReleaseNotes b/ReleaseNotes
index 545545b0f..3f95bdf6c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -123,10 +123,8 @@ Changes in version 0.4.2.5 - 2019-12-??
       line parsing. Closes ticket 31529.
 
   o Minor features (geoip):
-    - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
-      Country database. Closes ticket 32440.
-    - Update geoip and geoip6 to the October 1 2019 Maxmind GeoLite2
-      Country database. Closes ticket 31931.
+    - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+      Country database. Closes ticket 32685.
 
   o Minor features (git hooks):
     - Our pre-commit git hook now checks for a special file before
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.
-

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits