[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3

[nickm at torproject.org]

commit 71065201dd6dcaf08238a2d09a604dfcdb4aa271
Merge: ca6d289c0 ee860b8f3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 14 12:47:09 2018 -0400

    Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3

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