summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-06 16:20:56 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-06 16:20:56 -0500
commit6ab63bf2a825be4dc87de36baefb05d3175fc184 (patch)
tree0f2b2077ea18acf086e96ba024b3a55eb486e047
parentefd6864d39a498b6873ac609835d203a40b17518 (diff)
downloadtor-6ab63bf2a825be4dc87de36baefb05d3175fc184.tar.gz
tor-6ab63bf2a825be4dc87de36baefb05d3175fc184.zip
actually include geoip changelog entry in 041.
-rw-r--r--ChangeLog6
1 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0aeb483d5f..5c77267523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,9 +40,9 @@ Changes in version 0.4.1.7 - 2019-12-??
so that we are informed of all compilation failures, not just the
first one or two. Closes ticket 31372.
- 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 bugfixes (Appveyor CI, backport from 0.4.2.2-alpha):
- Avoid spurious errors when Appveyor CI fails before the install step.