Merge branch 'travis-osx-032' into travis-osx-033

Preserve 033 changes since 032.

diff --cc .travis.yml
index 3d86fdc1b79a7d2a4dc50133ce9a5af4a86662a7,f92a3d8d411bc28a967c07709d70a803a28c77f4..bfb3e7b51fde2eb8701475b546a3fd5189e40476
--- 1/.travis.yml
--- 2/.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