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

[nickm at torproject.org]

commit 1de722d7a911d0814078d7b370bc536e4db8f37c
Merge: 5cb45d2c7 8184f45ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 16 13:10:19 2018 -0400

    Merge branch 'maint-0.3.4'

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