diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-08-27 11:49:36 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-08-27 11:49:36 +0300 |
| commit | 357e9a6f2c88b99e85e65c0401c524adbe921665 (patch) | |
| tree | 78ebecf2bcf92b8b5338a46337b924f0d9ff979e | |
| parent | 90f4ed2335fee8bba6e232c6d92078cb133f5b9e (diff) | |
| parent | 190386f1c44462fbef568ca9e3c1c997dbebcf12 (diff) | |
| download | tor-357e9a6f2c88b99e85e65c0401c524adbe921665.tar.gz tor-357e9a6f2c88b99e85e65c0401c524adbe921665.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
| -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 3c605b4d91..070c8db558 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. |