[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



commit 6f615ee205c206df83bea6dd7aebeb57d504da28
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 6 16:05:47 2019 -0500

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

diff --git a/ChangeLog b/ChangeLog
index 9c741c4bc..5b8b62c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,9 +97,9 @@ Changes in version 0.4.0.6 - 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 (stem tests, backport from 0.4.2.1-alpha):
     - Change "make test-stem" so it only runs the stem tests that use
@@ -336,8 +336,6 @@ Changes in version 0.4.0.6 - 2019-12-??
       ticket 30860.
     - Simplify the Travis CI build matrix, and optimise for build time.
       Closes ticket 31859.
-    - Simplify the Travis CI build matrix, and optimise for build time.
-      Closes ticket 31859.
     - Use Windows Server 2019 instead of Windows Server 2016 in our
       Appveyor builds. Closes ticket 32086.
 
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