Merge branch 'maint-0.3.3' into maint-0.3.4

1af69c18 · Nick Mathewson · 9b9625bd · 451a84ce · 1af69c18 · 1af69c18
Commit 1af69c18 authored Jul 09, 2018 by Nick Mathewson 👉
--- a/changes/geoip-2018-07-03
+++ b/changes/geoip-2018-07-03
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the July 3 2018 Maxmind GeoLite2
+      Country database. Closes ticket 26674.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6