commit 9d922b8eaae542429e1a12d82a43883b3be69acf Merge: b3112a6d26 07934664c5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 23 10:10:32 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503 ++++++++++++++++++--------------------- 2 files changed, 238 insertions(+), 270 deletions(-)