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

[nickm at torproject.org]

commit 6c38795b7ef0dbe88f188b60e65d6b850946374c
Merge: 156e9723b 8b108935b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 21 08:54:02 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26435 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)