Merge branch 'maint-0.2.6' into release-0.2.6

2016-10-06 10:00:49 -04:00 · 2016-10-06 10:00:49 -04:00 · f20ec6a322
parent 28e42f6fff 12a7298376
commit f20ec6a322
6 changed files with 39529 additions and 15511 deletions
--- a/changes/geoip-august2016
+++ b/changes/geoip-august2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+      Country database.
+
--- a/changes/geoip-july2016
+++ b/changes/geoip-july2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the July 6 2016 Maxmind GeoLite2
+      Country database.
+
--- 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/changes/geoip-september2016
+++ b/changes/geoip-september2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6