summaryrefslogtreecommitdiff
path: root/src/rust/crypto
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-10 13:15:16 +1000
committerteor <teor@torproject.org>2018-08-10 13:15:16 +1000
commit6e0be81211d7f9251231468c50b696aac2f8c9a1 (patch)
tree00ccb5654a44467f365c8af86414fd7307159f2d /src/rust/crypto
parent0f0dac0bfcfc357a87c3d275e9846bdfca946877 (diff)
parente1291aa84a04b8006130ce08338ee07a662e5ce0 (diff)
downloadtor-6e0be81211d7f9251231468c50b696aac2f8c9a1.tar.gz
tor-6e0be81211d7f9251231468c50b696aac2f8c9a1.zip
Merge branch 'travis-osx-033' into travis-osx-034
Replace 034 .travis.yml with 033 .travis.yml. Subsequent commits will restore 034 functionality. Replace 034 src/test/test_rust.sh with 033 src/test/test_rust.sh, which was backported from master.
Diffstat (limited to 'src/rust/crypto')
0 files changed, 0 insertions, 0 deletions