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

commit e7fc833753c31e7815151d9fda60166ee10f0fd3 Merge: a89ebdbc37 9a4366b3e3 Author: David Goulet dgoulet@torproject.org Date: Thu Dec 16 09:28:17 2021 -0500

Merge branch 'maint-0.4.6' into release-0.4.6

changes/fallbackdirs-2021-12-15 | 2 + changes/geoip-2021-12-15 | 3 + configure.ac | 4 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/app/config/fallback_dirs.inc | 960 ++- src/config/geoip | 15760 +++++++++++++++++++++------------- src/config/geoip6 | 10443 ++++++++++++++++------ src/win32/orconfig.h | 2 +- 8 files changed, 17870 insertions(+), 9306 deletions(-)