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

[nickm at torproject.org]

commit bba64c9882ffabfdd5cc75554bef222e7eb1e25a
Merge: 6eb5a811d 90f4ed233
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 10:37:21 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/ticket31406          | 3 +++
 src/app/config/auth_dirs.inc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)