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

[nickm at torproject.org]

commit 07934664c56f3b5b9f500d2906b0cd7c7b39ec31
Merge: 1ee164afc2 6354b70e49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 23 10:09:14 2020 -0400

    Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/ticket40061              |   5 +
 src/app/config/fallback_dirs.inc | 503 ++++++++++++++++++---------------------
 2 files changed, 238 insertions(+), 270 deletions(-)