commit da404910a7cb25c20baf3fbf5e7a6a056bdbe9df Merge: bd11fb109 4a34fd5b7 Author: teor teor@torproject.org Date: Mon Dec 16 09:15:42 2019 +1000

Merge branch 'bug32240_041' into bug32240_042

Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2

.travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-)

diff --cc .travis.yml index 80c8611a4,8d68629ea..aee59ed26 --- a/.travis.yml +++ b/.travis.yml @@@ -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 -