commit 3a6affb15fbf589cd37f4a7d48abf9b5af604926 Merge: 2869dc9e7 4aa02d3c7 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:27:44 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 2337 ++++++---- 3 files changed, 7344 insertions(+), 5352 deletions(-)