Merge branch 'maint-0.2.5' into maint-0.2.6

2016-10-06 09:59:03 -04:00 · 2016-10-06 09:59:03 -04:00 · 12a7298376
parent 52a99cb6c1 304d8f3bbb
commit 12a7298376
3 changed files with 48664 additions and 16755 deletions
--- a/changes/geoip-october2016
+++ b/changes/geoip-october2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6