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

[nickm at torproject.org]

commit 8184f45ad94b5305c519f427a503d14ecb2f12dd
Merge: 71ddfbaad ccf1eb316
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 16 13:10:19 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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