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

[nickm at torproject.org]

commit 0b4a0c1a26f7976401809e29331ca252ce576a0f
Merge: 9131fe7eb2 b014866f6a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 12 11:30:22 2021 -0500

    Merge branch '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(-)