[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

[nickm at torproject.org]

commit 6513102b9d186793402e05ec3d37f077d01a0cc2
Merge: 8933c7908 c7ca3fc18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 6 16:02:08 2019 -0500

    Merge branch 'maint-0.4.0' into maint-0.4.1

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