Merge branch 'maint-0.2.5' into release-0.2.5

2017-02-13 14:39:13 -05:00 · 2017-02-13 14:39:13 -05:00 · c0257f14cd
parent 2f6a66a174 124062e843
commit c0257f14cd
3 changed files with 7351 additions and 5136 deletions
--- a/changes/geoip-february2017
+++ b/changes/geoip-february2017
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6