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

[nickm at torproject.org]

commit e730629a2f79e08b537b488b6bbcf6f23aa1df3c
Merge: c05059f736 0397a9cb49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:58 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/geoip-2021-05-07 |    3 +
 src/config/geoip         | 3227 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        | 1702 ++++++++++++++++--------
 3 files changed, 3098 insertions(+), 1834 deletions(-)