Merge branch 'maint-0.2.4' into release-0.2.4

af082895 · Nick Mathewson · b346d43c · 6199e27a · af082895 · af082895
Commit af082895 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