[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

[nickm at torproject.org]

commit 5e1660100027e742c39c073c84add64e093f7745
Merge: 3ccf91027 2a42d6be2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 1 14:25:12 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

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