[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3

[nickm at torproject.org]

commit f721a08220fc0bef4e029e3fb87b9160782527c0
Merge: 451a84cec d935aceb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:13:58 2018 -0400

    Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3

 src/test/test_rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)