commit 262f30dd339410c1a5a106fcb6e077b8d439e61e Merge: 58c2b35b5 bba64c988 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

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