commit 2a42d6be2707bbc28ad9d68055799297d1d07daf Merge: afa2c39ba 1dd952789 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567 ++++++++++++++++++--------------------- 2 files changed, 266 insertions(+), 306 deletions(-)