commit 053c4578dec4b8cb1d325ed524cfd9a4b87973de Merge: a6de7341dd b8660e384f Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:15:59 2021 +0000

Merge branch 'maint-0.4.6' into release-0.4.6

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