[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

[dgoulet at torproject.org]

commit 4c3c40e70c654dbae59034a835c0f04b10808e87
Merge: b8660e384f 33abeeab94
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 12 12:13:26 2021 -0400

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