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

[nickm at torproject.org]

commit 8eb9aaf4f65affed0aa450028464a30ab06f74dd
Merge: 347b38d6d db6902c23
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 10 14:26:32 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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