summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-06 16:06:01 -0500
committerNick Mathewson <nickm@torproject.org>2019-12-06 16:06:01 -0500
commitad9bcbfc87d1c727fda51c0a32ad9a5189ad8f3e (patch)
tree17412b09ff86f8f88c5876561e834d66bcd8f9a7
parent8646b4dde78a7e7d82de1cefc134b3f9f921624d (diff)
downloadtor-ad9bcbfc87d1c727fda51c0a32ad9a5189ad8f3e.tar.gz
tor-ad9bcbfc87d1c727fda51c0a32ad9a5189ad8f3e.zip
update changelog for new geoip entry.
-rw-r--r--ChangeLog4
-rw-r--r--ReleaseNotes6
-rw-r--r--changes/geoip-2019-12-034
3 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index bbefe58d00..fa66eacc99 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 545545b0f8..3f95bdf6ca 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 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.
-