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

[dgoulet at torproject.org]

commit 2f171f30c8fdcf968ea304d48c42db9fbd0efdf4
Merge: ae05f06597 d496a75026
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Oct 21 10:01:39 2021 -0400

    Merge branch 'maint-0.4.6'

 changes/ticket40493              |   2 +
 src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++--------------------
 2 files changed, 472 insertions(+), 481 deletions(-)