commit 56fdd4f169be02aa9372b659bc349230a3009ff7 Merge: a219449b9 2a42d6be2 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 1 14:25:12 2019 -0400
Merge branch 'maint-0.4.0' into release-0.4.0
changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567 ++++++++++++++++++--------------------- 2 files changed, 266 insertions(+), 306 deletions(-)