]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug32240_041' into bug32240_042
authorteor <teor@torproject.org>
Sun, 15 Dec 2019 23:15:42 +0000 (09:15 +1000)
committerteor <teor@torproject.org>
Sun, 15 Dec 2019 23:15:42 +0000 (09:15 +1000)
Merge:
* CHUTNEY_TOR_SANDBOX=0 from bug32240_041
* RUST_VERSION from maint-0.4.2

1  2 
.travis.yml

diff --cc .travis.yml
index 80c8611a419070bcf75e2944f3cd2d9d82680526,8d68629ea6b1a78015ce94ca35ad087a7ee50243..aee59ed26852176b1fabe37f45e10fed15b3c099
@@@ -29,8 -29,9 +29,11 @@@ env
      - HARDENING_OPTIONS="--enable-expensive-hardening"
      ## We turn off asciidoc by default, because it's slow
      - ASCIIDOC_OPTIONS="--disable-asciidoc"
 +    ## Our default rust version is the minimum supported version
 +    - RUST_VERSION="1.31.0"
+     ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are
+     ## triggered by Ubuntu Xenial and Bionic. See #32722.
+     - CHUTNEY_TOR_SANDBOX="0"
    matrix:
      ## This matrix entry is required, but it doesn't actually create any jobs
      -