commit f7dbae4e894a048e3fe74d14c0d45bd4090cf99c Merge: 05af1e25a0 6354b70e49 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 23 10:09:14 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503 ++++++++++++++++++--------------------- 2 files changed, 238 insertions(+), 270 deletions(-)