commit 3bcbd69a776f0602fd8524a1a24fbe60666dd77f Merge: 49b4d1765c f916ddd312 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 23 10:09:14 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

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