commit 2fdeeaa64d79c156b4bf68eadff4aedd5500a515 Merge: 5be41d420f d496a75026 Author: David Goulet <dgoulet@torproject.org> Date: Thu Oct 21 10:01:38 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-)