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. -