Merge branch 'maint-0.2.5' into release-0.2.5

2017-05-08 08:08:01 -04:00 · 2017-05-08 08:08:01 -04:00 · 33b69e6884
parent 148d76c092 68d6720452
commit 33b69e6884
3 changed files with 4358 additions and 2197 deletions
--- a/changes/geoip-may2017
+++ b/changes/geoip-may2017
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the May 2 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6