commit 6354b70e49a50815dce94906122266c6bb744e63 Merge: 0acc3ae879 3bcbd69a77 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 23 10:09:14 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

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