Merge branch 'maint-0.2.5' into maint-0.2.6

2024-11-24 04:13:28 +01:00 · 2016-05-09 14:55:45 -04:00 · 2016-05-09 14:55:45 -04:00 · 0b477bfd55
commit 0b477bfd55
parent 2ce99b9f48 368146370b
3 changed files with 4631 additions and 3268 deletions
--- a/changes/geoip-may2016
+++ b/changes/geoip-may2016
@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6