Nick Mathewson 0483f7f64c Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
..
common f68aab83ba Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
config b4362b99cf Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
ext 4a5c1584fe update tor-rust-dependencies submodule %!s(int64=6) %!d(string=hai) anos
or 658171318f Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
rust aac1e17f22 Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
test 0483f7f64c Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=5) %!d(string=hai) anos
tools c3b7258370 Merge remote-tracking branch 'isis/bug24660_r1' %!s(int64=6) %!d(string=hai) anos
trace 236cf49670 Add stub function for libor-trace. %!s(int64=7) %!d(string=hai) anos
trunnel b7fae0f48c Heed --disable-unittests properly %!s(int64=6) %!d(string=hai) anos
win32 4c1c818ffa Update to 0.3.4.7-rc-dev %!s(int64=5) %!d(string=hai) anos
include.am 915fa39d0f Add --enable-rust configure switch %!s(int64=7) %!d(string=hai) anos