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

[nickm at torproject.org]

commit 398f15bdf174c8b480b2d8984562f8360cbd2dda
Merge: c86850c4c 7589fd6d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 16:37:39 2018 -0400

    Merge branch 'maint-0.3.4'

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