commit e8dd83aecb6faaca81e7c808010ae08c2ac574c9 Merge: 573b6e4f2 ae2085dd7 Author: teor teor@torproject.org Date: Thu Aug 23 18:20:17 2018 +1000

Merge branch 'ticket27252-033' into ticket27252-034

Semantic merge: - Rust offline and online were swapped in ticket27252-032

.travis.yml | 23 +++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-)

diff --cc .travis.yml index 7db757785,bf0152384..7cc8086b9 --- a/.travis.yml +++ b/.travis.yml @@@ -50,12 -51,9 +51,12 @@@ matrix # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline with distcheck, to make sure we remove rust products + ## Check rust online with distcheck, to make sure we remove rust products ## But without hardening (see above) - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" + ## Check disable module dirauth with rust, and without rust but with distcheck + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth"

## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have