diff --git a/ChangeLog b/ChangeLog index 90a01a734c..aa90ade4ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,10 @@ Changes in version 0.3.5.7 - 2019-01-07 - When possible, place our warning flags in a separate file, to avoid flooding verbose build logs. Closes ticket 28924. + o Minor features (geoip): + - Update geoip and geoip6 to the January 3 2019 Maxmind GeoLite2 + Country database. Closes ticket 29012. + o Minor features (OpenSSL bug workaround): - Work around a bug in OpenSSL 1.1.1a, which prevented the TLS 1.3 key export function from handling long labels. When this bug is diff --git a/changes/geoip-2019-01-03 b/changes/geoip-2019-01-03 deleted file mode 100644 index 27ffb7f460..0000000000 --- a/changes/geoip-2019-01-03 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the January 3 2019 Maxmind GeoLite2 - Country database. Closes ticket 29012. -