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

[nickm at torproject.org]

commit cb3821966430abc51d81cb01bd32fc956f0c8125
Merge: b3fe9d5162 d60f8fe98a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:21:48 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/geoip-2021-06-10 |    3 +
 src/config/geoip         | 4764 +++++++++++++++++++++++++++-------------------
 src/config/geoip6        | 2826 ++++++++++++++++-----------
 3 files changed, 4536 insertions(+), 3057 deletions(-)