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

[nickm at torproject.org]

commit b5a6de9e83616cfe0d1536a99893da7758eb93cb
Merge: 8376fdb586 ee7c50b8a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 16:59:15 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket40265              |    3 +
 src/app/config/fallback_dirs.inc | 1040 ++++++++++++++++++++++++--------------
 2 files changed, 660 insertions(+), 383 deletions(-)