Merge branch 'maint-0.3.3'

2018-05-15 09:32:45 -04:00 · 2018-05-15 09:32:45 -04:00 · 98aff146d3
parent a394a2dd86 6acbd4c112
commit 98aff146d3
3 changed files with 4468 additions and 1962 deletions
--- a/changes/geoip-2018-05-01
+++ b/changes/geoip-2018-05-01
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the May 1 2018 Maxmind GeoLite2
+      Country database. Closes ticket 26104.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6