commit 6ecfe45a067eb33b7e44da5ae458f26e06a3ab6e Merge: 0f7dd66806 81635ec577 Author: Alexander Færøy <ahf@torproject.org> Date: Wed Aug 11 13:15:59 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40447 | 2 + src/app/config/fallback_dirs.inc | 948 ++++++++++++++++++++------------------- 2 files changed, 482 insertions(+), 468 deletions(-)