Merge branch 'maint-0.3.5' into maint-0.4.0

c7ca3fc1 · Nick Mathewson · e66533be · 74cae547 · c7ca3fc1 · c7ca3fc1
Commit c7ca3fc1 authored Dec 06, 2019 by Nick Mathewson 🏃
--- a/changes/geoip-2019-12-03
+++ b/changes/geoip-2019-12-03
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+      Country database. Closes ticket 32685.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6