Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-20 12:15:24 -05:00 · 2017-12-20 12:15:24 -05:00 · c2b64ad096
parent 748f0abc2d 7e45720cf4
commit c2b64ad096
3 changed files with 10033 additions and 5724 deletions
--- a/changes/geoip-2017-12-06
+++ b/changes/geoip-2017-12-06
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the December 6 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6