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

commit f55edf5b34852289c34d023a1a72494c184f424e Merge: a141b355a1 eca5b62213 Author: David Goulet dgoulet@torproject.org Date: Thu Aug 12 12:13:25 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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