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

[nickm at torproject.org]

commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d
Merge: 8142b368e7 7fe819c951
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:58 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/geoip-2021-05-07 |    3 +
 src/config/geoip         | 3227 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        | 1702 ++++++++++++++++--------
 3 files changed, 3098 insertions(+), 1834 deletions(-)