Merge branch 'maint-0.2.4' into maint-0.2.5

2016-04-07 10:45:32 -04:00 · 2016-04-07 10:45:32 -04:00 · 34a51d1621
parent 21f9829e79 97c6e717b9
commit 34a51d1621
3 changed files with 4455 additions and 1353 deletions
--- a/changes/geoip-april2016
+++ b/changes/geoip-april2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the April 5 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6