commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 10 14:25:57 2018 -0400

Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)