commit 1628af235e5fe06536ad6ec32bf87f2225c82d32 Merge: ef17aa0d8d 421ce94395 Author: David Goulet dgoulet@torproject.org Date: Mon Jan 24 10:49:41 2022 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/fallbackdirs-2022-01-24 | 2 + changes/geoip-2022-01-24 | 3 + configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/app/config/fallback_dirs.inc | 966 +- src/config/geoip | 19654 +++++++++++++++++++++------------- src/config/geoip6 | 13316 ++++++++++++++++------- src/win32/orconfig.h | 2 +- 8 files changed, 21957 insertions(+), 11990 deletions(-)