Merge branch 'maint-0.2.5' into release-0.2.5

2017-04-06 08:32:36 -04:00 · 2017-04-06 08:32:36 -04:00 · 148d76c092
parent 51ca3dc811 a8a860e1da
commit 148d76c092
3 changed files with 9792 additions and 5255 deletions
--- a/changes/geoip-april2017
+++ b/changes/geoip-april2017
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the April 4 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6