commit 03461d5d401d9d9ddfaabd6f09648d4338460449 Merge: b86c2c178 16381b579 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)