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

[nickm at torproject.org]

commit f84ed7edafb1acbccf4d8f01d80f9020cb6010c7
Merge: 44df63e591 b323e6b8c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 10:36:00 2021 -0400

    Merge branch 'maint-0.4.4' into release-0.4.4

 changes/geoip-2021-04-13 |     3 +
 src/config/geoip         | 10953 +++++++++++++++++++++------------------------
 src/config/geoip6        |  2608 +++++++----
 3 files changed, 6970 insertions(+), 6594 deletions(-)