commit 4aa02d3c7abe84e99874f6bf7bfffb7b551935a5 Merge: 0418d4081 3cfcfbac4 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:27:43 2019 -0400

Merge branch 'maint-0.3.4' into maint-0.3.5

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