Merge branch 'maint-0.2.5' into release-0.2.5

2016-11-07 09:30:05 -05:00 · 2016-11-07 09:30:05 -05:00 · 1ffe29ff8d
parent d27160b407 db2571be61
commit 1ffe29ff8d
3 changed files with 3407 additions and 3112 deletions
--- a/changes/geoip-november2016
+++ b/changes/geoip-november2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6