Nick Mathewson 945d871da5 Merge branch 'maint-0.3.3' %!s(int64=6) %!d(string=hai) anos
..
.dummy df76da0f3b Add a .dummy file in the changes directory to stop git from removing it %!s(int64=9) %!d(string=hai) anos
bug24891 b7fae0f48c Heed --disable-unittests properly %!s(int64=6) %!d(string=hai) anos
bug25686_diagnostic faf4580061 Several attempts to diagnose ticket 25686 %!s(int64=6) %!d(string=hai) anos
bug26158 9713ecfc40 Fix an extra space in a changes file %!s(int64=6) %!d(string=hai) anos
bug26258_033 9d06c41c6e Make sure that the test_rust.sh script fails when a test fails %!s(int64=6) %!d(string=hai) anos