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

[nickm at torproject.org]

commit 79d3f401a5c87a61ca153af207039158db5f7874
Merge: 2b3138741 657d5cbbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 23 11:18:20 2018 -0400

    Merge branch 'bug25560_rebased_033' into maint-0.3.3

 changes/bug25560      |  5 +++++
 src/test/include.am   |  2 +-
 src/test/test_rust.sh | 23 +++++++++--------------
 3 files changed, 15 insertions(+), 15 deletions(-)