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

[nickm at torproject.org]

commit 03f3ee6d74d548b1f8ed10c475f450977c518b34
Merge: b13fe14cb eaa359650
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 09:44:17 2018 -0400

    Merge branch 'maint-0.3.3'

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