Merge branch 'maint-0.2.4' into maint-0.2.5

304d8f3b · Nick Mathewson · e4d82da0 · 1b4984f1 · 304d8f3b · 304d8f3b
Commit 304d8f3b authored Oct 06, 2016 by Nick Mathewson 🎨
--- a/changes/geoip-october2016
+++ b/changes/geoip-october2016
+  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