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

[nickm at torproject.org]

commit 98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906
Merge: 6ad2c2b92 cd4795ca3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 12 14:32:16 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

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