nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.0

Browse Source
This commit is contained in:
George Kadianakis 2019-08-27 11:49:36 +03:00
commit 357e9a6f2c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -91,7 +91,7 @@ matrix:
- compiler: gcc - compiler: gcc
os: linux os: linux
## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 ## 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) ## (Linux only) Use the latest Linux image (Ubuntu Trusty)
dist: trusty dist: trusty

3
changes/bug31463 Normal file
View File

@ -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.