[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit b6c50c625941f16339b8680ca45e6f3dba2a9a97
Merge: 0317eb143 e0f33c1d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 12 14:32:16 2018 -0400

    Merge branch 'maint-0.3.4'

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