Merge branch 'maint-0.3.3' into release-0.3.3

0e74894c · Nick Mathewson · 6d26fcfe · 0c9cd7c4 · 0e74894c · 0e74894c
Commit 0e74894c authored Mar 06, 2019 by Nick Mathewson 🌻
--- a/changes/geoip-2019-03-04
+++ b/changes/geoip-2019-03-04
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the March 4 2019 Maxmind GeoLite2
+      Country database. Closes ticket 29666.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6