commit 5653b93a1d25e173bebb8f45d364e3a578572789 Merge: d253b31ce 5a1c3e44f Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into maint-0.3.5

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