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

[nickm at torproject.org]

commit 49740f020da8da6866953e1b2f55a2d5faf33876
Merge: 6088a73c73 f68aeda549
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:57 2021 -0400

    Merge branch 'maint-0.4.4' into release-0.4.4

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