diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
| commit | 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 (patch) | |
| tree | af016c6f7efef8246ccabc1c3f8db03ed96050a5 /changes/bug24769 | |
| parent | c4d0d9bd24c484893055d50999377f86fd9468c7 (diff) | |
| parent | 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 (diff) | |
| download | tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.tar.gz tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.zip | |
Merge branch 'travis-osx-032' into travis-osx-033
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.
src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.
Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
Diffstat (limited to 'changes/bug24769')
0 files changed, 0 insertions, 0 deletions