Merge branch 'maint-0.2.5' into release-0.2.5

279fa65d · Nick Mathewson · 1d281eb9 · 1fa396b0 · 279fa65d · 279fa65d
Commit 279fa65d authored Apr 05, 2018 by Nick Mathewson 🌻
--- a/changes/geoip-2018-04-03
+++ b/changes/geoip-2018-04-03
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the April 3 2018 Maxmind GeoLite2
+      Country database. Closes ticket 25718.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6