Merge branch 'maint-0.2.6' into release-0.2.6

2017-06-09 09:58:45 -04:00 · 2017-06-09 09:58:45 -04:00 · eb4ca1c16e
parent 8a556f996c 3913f959e3
commit eb4ca1c16e
3 changed files with 4449 additions and 2586 deletions
--- a/changes/geoip-june2017
+++ b/changes/geoip-june2017
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the June 8 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6