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

[dgoulet at torproject.org]

commit b5c565728eaf732bd6621fe582a3abe654258e47
Merge: 35cba3ae33 b014866f6a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:30:22 2021 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

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