Merge branch 'maint-0.2.6' into release-0.2.6

2017-03-08 10:10:55 -05:00 · 2017-03-08 10:10:55 -05:00 · 73371db4b9
parent c0c68547ea ecc73c3c03
commit 73371db4b9
3 changed files with 5884 additions and 7989 deletions
--- a/changes/geoip-march2017
+++ b/changes/geoip-march2017
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the March 7 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6