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

[nickm at torproject.org]

commit 945d871da54e6038fdabaf3b78a7a55b290ab6aa
Merge: ed7b13581 71065201d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 14 12:49:57 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug26258_033  |  4 ++++
 src/test/include.am   |  1 +
 src/test/test_rust.sh | 24 +++++++++++++++---------
 3 files changed, 20 insertions(+), 9 deletions(-)