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

[nickm at torproject.org]

commit 7c360ee7581e606149e16c460d08117b8933e8d1
Merge: f1a88ec11 79d3f401a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 23 11:18:23 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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