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

[nickm at torproject.org]

commit 1c9890bd3100730b0af1650b90c6a35d8e9e0997
Merge: 89e3028590 0397a9cb49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:53:58 2021 -0400

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