Merge branch 'maint-0.2.9' into release-0.2.9

2018-05-15 09:32:44 -04:00 · 2018-05-15 09:32:44 -04:00 · 6ac0ec566e
parent a1c06b84b3 033e4723f3
commit 6ac0ec566e
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