commit 59bc377dce760c3ef6a8b694d6c3a347c9e40d2b Merge: 1f21b6e6a7 59f6248e09 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 13 16:59:16 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40265 | 3 + src/app/config/fallback_dirs.inc | 1040 ++++++++++++++++++++++++-------------- 2 files changed, 660 insertions(+), 383 deletions(-)