commit 6ea38c4b55d2624979f281701e4d74add6438396 Merge: 8e9996752 71065201d Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 14 12:50:32 2018 -0400

Merge branch 'maint-0.3.3' into release-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(-)