commit c7ca3fc1869f4999845526d7fd883e17630143e9 Merge: e66533bef 74cae547e Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 6 16:02:07 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 4621 ++++++++------- 3 files changed, 10717 insertions(+), 7841 deletions(-)