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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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