commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8 Merge: 0135fb028c 66e8e0f71b Author: David Goulet dgoulet@torproject.org Date: Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-)