commit f6c58d9f0038bb5bd57d1e2abd384266fb9cd55f Merge: 4ff083098 5e1660100 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

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