Merge branch 'maint-0.3.3'

2018-03-13 10:59:56 -04:00 · 2018-03-13 10:59:56 -04:00 · c6d364e8ae
parent 1047ef140e 6bc324c96a
commit c6d364e8ae
3 changed files with 9970 additions and 27078 deletions
--- a/changes/geoip-2018-03-08
+++ b/changes/geoip-2018-03-08
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the March 8 2018 Maxmind GeoLite2
+      Country database. Closes ticket 25469.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6