commit 4de31504b0fe5b679b929981d0eb60b878859d7f Merge: c3a3539da c7ca3fc18 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 6 16:02:08 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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