commit 7e0971d868f72e84a5f09c3c738e3e75b495680e Merge: fe5a9db1e6 0e60b65f6c Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 13:15:35 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/417' into maint-0.3.5

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