commit 59f6248e09d5560b6ae531d63af7f6c21ed12118 Merge: b323e6b8c2 ee7c50b8a7 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 13 16:59:15 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.4

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