commit 7a59b9f549c2510801f6921dd4acd7105963616d Merge: d1a8c10fc1 07934664c5 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 23 10:09:14 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

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