Merge branch 'maint-0.3.2' into release-0.3.2

2018-05-15 09:32:44 -04:00 · 2018-05-15 09:32:44 -04:00 · e8edd97c1c
parent e935e27676 4aa3d511b2
commit e8edd97c1c
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