commit 2daff0b045752cc3d6cb09aef7853241de73fccc Merge: 4b0a0b9952 59bc377dce Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 13 16:59:16 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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