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

[nickm at torproject.org]

commit c214402a56ea417ee6b7449d8b60cd79ba3070e2
Merge: a8e6eab37 bba64c988
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 10:37:22 2019 -0400

    Merge branch 'maint-0.4.1'

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