aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-06 16:05:47 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-06 16:05:47 -0500
commit6f615ee205c206df83bea6dd7aebeb57d504da28 (patch)
tree2c1dc35fa376292bc46c4d28ee71b55056c64b9f
parent4de31504b0fe5b679b929981d0eb60b878859d7f (diff)
downloadtor-6f615ee205c206df83bea6dd7aebeb57d504da28.tar.gz
tor-6f615ee205c206df83bea6dd7aebeb57d504da28.zip
update changelog for new geoip entry.
-rw-r--r--ChangeLog8
-rw-r--r--changes/geoip-2019-12-034
2 files changed, 3 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c741c4bcd..5b8b62c7be 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 ea62b6ee89..0000000000
--- 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.
-