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

[nickm at torproject.org]

commit a2e500f1ffd7978d05916060f9d9ff9496d734c0
Merge: 33e2c5962c cb38219664
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 08:21:49 2021 -0400

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