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

[dgoulet at torproject.org]

commit 7d242875cdab0485bc23060b21713a78f316713b
Merge: 6ecfe45a06 33abeeab94
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 12 12:13:26 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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