Merge branch 'maint-0.3.4' into release-0.3.4

e2dde342 · Nick Mathewson · fa6296df · a521c427 · e2dde342 · e2dde342
Commit e2dde342 authored May 17, 2019 by Nick Mathewson 🌻
--- a/changes/geoip-2019-05-13
+++ b/changes/geoip-2019-05-13
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the May 13 2019 Maxmind GeoLite2
+      Country database. Closes ticket 30522.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6