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

[dgoulet at torproject.org]

commit d496a750266c777466f14639a76e43657dd68226
Merge: bd1c14f015 1dab1c8ad5
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Oct 21 10:01:38 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6

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