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

[nickm at torproject.org]

commit bb3f8445e36c439564def683a9c0493e51c65a44
Merge: 9d0c64cea cd4795ca3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 12 14:32:16 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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