[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 5a2232e62733aa6096f38271d883b9bedf63a87c
Merge: 8a363a7c8 10a1969ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 10 14:26:01 2018 -0400

    Merge branch 'maint-0.2.9' into release-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(-)