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