[tor-commits] [tor/master] Merge branch 'travis-osx-032' into travis-osx-033

[nickm at torproject.org]

commit ed1210d0f11d21ce97823f88bf20d3659a8927cf
Merge: 546c13480 69adc68ac
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 16:38:13 2018 +1000

    Merge branch 'travis-osx-032' into travis-osx-033
    
    Preserve 033 changes since 032.

 .travis.yml         | 3 ++-
 changes/ticket24629 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc .travis.yml
index 3d86fdc1b,f92a3d8d4..bfb3e7b51
--- a/.travis.yml
+++ b/.travis.yml
@@@ -49,10 -49,11 +49,10 @@@ matrix
      ## We run rust and coverage with hardening off, which seems like enough
      # - env: HARDENING_OPTIONS=""
      ## We check asciidoc with distcheck, to make sure we remove doc products
-     - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes"
+     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS=""
 -    ## Check rust offline without hardening (see above), or distcheck
 -    ## Distcheck doesn't work with rust in 0.3.2
 -    ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
 -    - env: RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS=""
 +    ## Check rust offline 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=""
  
    ## Uncomment to allow the build to report success (with non-required
    ## sub-builds continuing to run) if all required sub-builds have