commit 32f1501b96b0741304e042afede15a8b930390cb Merge: 82fca02735 f916ddd312 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 23 10:09:13 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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