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

[nickm at torproject.org]

commit 75732ef4cd45fa822d80b7f95330c5447a2b3e9a
Merge: bded08415 ef671147f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 09:44:17 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)