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

[nickm at torproject.org]

commit b014866f6a64ab5f2cf168bc961a899b2aafc4ec
Merge: e8d224dfb1 41796158e6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:30:22 2021 -0500

    Merge branch 'maint-0.4.4' into maint-0.4.5

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