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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.5'

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