Merge branch 'maint-0.2.5' into release-0.2.5

2018-01-08 09:34:56 -05:00 · 2018-01-08 09:34:56 -05:00 · e212c752f2
parent eb0c7ab433 8efbeb0982
commit e212c752f2
3 changed files with 7587 additions and 24611 deletions
--- a/changes/geoip-2018-01-05
+++ b/changes/geoip-2018-01-05
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the January 5 2018 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6