commit b1da8b86f0274d18fe6fe834be216a0690857699 Merge: d0f969a43 db209d4db Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 12 09:56:49 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020 ++++++++++++++++++++++++++++++++------------- src/config/geoip6 | 2401 +++-- 3 files changed, 16972 insertions(+), 7453 deletions(-)