diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-24 16:29:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-24 16:29:23 -0400 |
| commit | f1707f7db3296e5ddae2f09ff269afdebf651ec4 (patch) | |
| tree | 54cbc460bab38064bdadb11648b562d75f5c0018 | |
| parent | d475d7c2fb3c0ed5120c50011b187f6957a4f52c (diff) | |
| parent | 7c92f4faa21be4deb03a7ef2e07fb0a15853fed8 (diff) | |
| download | tor-f1707f7db3296e5ddae2f09ff269afdebf651ec4.tar.gz tor-f1707f7db3296e5ddae2f09ff269afdebf651ec4.zip | |
Merge branch 'maint-0.4.1'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/bug31463 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 36fb3a1b76..fe9266dffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 0000000000..d85c0887c3 --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha. |