[tor-commits] [tor/main] Merge branch 'maint-0.4.6' into main

[ahf at torproject.org]

commit 2160697d147efbf40ac0b4cf7ef902c1346ff20e
Merge: ac254d5334 b8660e384f
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Aug 11 13:15:59 2021 +0000

    Merge branch 'maint-0.4.6' into main

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