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

[nickm at torproject.org]

commit 336d8e61265d9c42ed2ce15fba1d9a01ba5a2744
Merge: 85d6b41d2 e0f33c1d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 12 14:32:16 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/task26771    | 4 ++++
 src/or/auth_dirs.inc | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)