[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[nickm at torproject.org]

commit 281572124399acd4ddf1d467cca330a904272dbe
Merge: 705ea32c6e 59bc377dce
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 17:00:56 2021 -0400

    Merge branch 'maint-0.4.5'

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