Merge branch 'maint-0.3.1' into release-0.3.1

2018-01-08 09:34:57 -05:00 · 2018-01-08 09:34:57 -05:00 · 0e5140320b
parent e9a102ff5e a1ce1ab201
commit 0e5140320b
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