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

[nickm at torproject.org]

commit d2aefffe2f528c26ce6a6594c4ce0fc6d0ac3895
Merge: 943291d7a 3d1266324
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 08:35:41 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25415 | 4 ++++
 1 file changed, 4 insertions(+)