Merge branch 'maint-0.3.2' into release-0.3.2

2017-11-11 12:23:34 -05:00 · 2017-11-11 12:23:34 -05:00 · 55aafbf7ba
parent 6a8c1667df 512dfa15ed
commit 55aafbf7ba
3 changed files with 6426 additions and 3832 deletions
--- a/changes/geoip-2017-11-06
+++ b/changes/geoip-2017-11-06
@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the November 6 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6