From: teor <teor@torproject.org>
Date: Thu, 23 Aug 2018 08:20:17 +0000 (+1000)
Subject: Merge branch 'ticket27252-033' into ticket27252-034
X-Git-Tag: tor-0.3.4.9~35^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8dd83aecb6faaca81e7c808010ae08c2ac574c9;p=thirdparty%2Ftor.git

Merge branch 'ticket27252-033' into ticket27252-034

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

e8dd83aecb6faaca81e7c808010ae08c2ac574c9
diff --cc .travis.yml
index 7db7577856,bf01523843..7cc8086b94
--- 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