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

[nickm at torproject.org]

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553
Merge: 306563ac6 d3ac47b41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 10 14:26:32 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 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(-)