commit a141b355a16b96dd477af18f2949bceb2465c504 Merge: ae6ab63f24 7e0971d868 Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:15:58 2021 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40447 | 2 + src/app/config/fallback_dirs.inc | 948 ++++++++++++++++++++------------------- 2 files changed, 482 insertions(+), 468 deletions(-)