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

[nickm at torproject.org]

commit d5dd500e36093499984e58882b07d2b9a5628235
Merge: 39d3187b0 e0f99404f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 16:39:25 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug26787 | 3 +++
 1 file changed, 3 insertions(+)