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

[nickm at torproject.org]

commit ca6d289c00e5e18b24c7f463e709125e545d4405
Merge: 049ba6674 7e7585d0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:59:28 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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