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

[nickm at torproject.org]

commit bb6362c06c713fd4fd0611b50d05b67ee05d2e74
Merge: f84ed7edaf 59f6248e09
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 16:59:16 2021 -0400

    Merge branch 'maint-0.4.4' into release-0.4.4

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