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

[dgoulet at torproject.org]

commit 4252744788ff91b11618234129769d5c2f151d6c
Merge: 2160697d14 4c3c40e70c
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 12 12:13:26 2021 -0400

    Merge branch 'maint-0.4.6'

 changes/geoip-2021-08-12 |     3 +
 src/config/geoip         | 11954 +++++++++++++++++++++++++++------------------
 src/config/geoip6        |  7433 +++++++++++++++++-----------
 3 files changed, 11890 insertions(+), 7500 deletions(-)