commit 90f4ed2335fee8bba6e232c6d92078cb133f5b9e Merge: 20943d00f 5653b93a1 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

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