Merge branch 'maint-0.2.6' into maint-0.2.7

2016-05-09 14:56:56 -04:00 · 2016-05-09 14:56:56 -04:00 · 7fe80c2905
parent 1a065cea46 0b477bfd55
commit 7fe80c2905
3 changed files with 4631 additions and 3268 deletions
--- a/changes/geoip-may2016
+++ b/changes/geoip-may2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6