Merge branch 'maint-0.2.5' into release-0.2.5

2018-02-08 10:29:05 -05:00 · 2018-02-08 10:29:05 -05:00 · b2c220a623
parent 7d1d868ea0 f1278b7e57
commit b2c220a623
3 changed files with 28369 additions and 6840 deletions
--- a/changes/geoip-2018-02-07
+++ b/changes/geoip-2018-02-07
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the February 7 2018 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6