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

commit e0f33c1d3e7b87fcea26b8ba2ffb9d292449d9d8 Merge: d7ad6d924 710188f84 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/task26771 | 4 ++++ src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)