Merge branch 'maint-0.2.6' into release-0.2.6

2016-12-09 08:34:51 -05:00 · 2016-12-09 08:34:51 -05:00 · 0b571cff23
parent a49be99eda 3d9f8ff6a5
commit 0b571cff23
3 changed files with 4705 additions and 2751 deletions
--- a/changes/geoip-december2016
+++ b/changes/geoip-december2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the December 7 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6