Merge branch 'maint-0.2.5' into maint-0.2.6

2016-02-05 08:13:24 -05:00 · 2016-02-05 08:13:24 -05:00 · 44ad3be221
parent e2efa9e321 f06d9a9cef
commit 44ad3be221
3 changed files with 2328 additions and 684 deletions
--- a/changes/geoip-february2016
+++ b/changes/geoip-february2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the February 2 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6