commit 4b4479773d4a95e4e7248736b8456597d8775da1 Merge: 38774cabb 1dd952789 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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