[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

[ahf at torproject.org]

commit 81635ec5775ce9ca275ae19f40df0fe9bce4ea33
Merge: c48d1c3f7c 7e0971d868
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Aug 11 13:15:58 2021 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.5

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