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

[nickm at torproject.org]

commit 877f7bbb4710ae6a67cb1ad633124109e751e7ed
Merge: 34ad10db54 41796158e6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:30:21 2021 -0500

    Merge branch 'maint-0.4.4' into release-0.4.4

 changes/geoip-2021-03-12 |      9 +
 src/config/geoip         | 144354 ++++++++++++++------------------------------
 src/config/geoip6        |  62679 +++++++++++++++----
 3 files changed, 95249 insertions(+), 111793 deletions(-)