[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

[nickm at torproject.org]

commit 7fe819c9510bc0b738c55abf7339b64498265c05
Merge: ec0b4bdafd f68aeda549
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:58 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

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