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

[dgoulet at torproject.org]

commit 4b0a0b9952fffc7035914838dc29761042418416
Merge: 1aa8fd66be 1f21b6e6a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 10:36:01 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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