Merge branch 'maint-0.2.6' into release-0.2.6

3ae8b32c · Nick Mathewson · c47ab786 · 6862eada · 3ae8b32c · 3ae8b32c
Commit 3ae8b32c authored Aug 01, 2017 by Nick Mathewson 🌻
--- a/changes/geoip-july2017
+++ b/changes/geoip-july2017
+  o Minor features:
+    - Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6