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

[ahf at torproject.org]

commit b8660e384f17457b30fb679ea577ca3e71026649
Merge: e3c2179f25 81635ec577
Author: Alexander Færøy <ahf at torproject.org>
Date:   Wed Aug 11 13:15:59 2021 +0000

    Merge branch 'maint-0.4.5' into maint-0.4.6

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