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

[nickm at torproject.org]

commit c0ea6f9c649dadd49897cc41da707f277338aec8
Merge: a5911c455 5e1660100
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 1 14:25:13 2019 -0400

    Merge branch 'maint-0.4.1'

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