[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 5082eeba38b36fbd87fea821a1f29a85b5cdd994
Merge: 648399d6c bd11fb109
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 08:16:28 2019 +1000

    Merge branch 'maint-0.4.2'

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

diff --cc .travis.yml
index eabc495aa,80c8611a4..1fee931e2
--- a/.travis.yml
+++ b/.travis.yml
@@@ -66,12 -66,12 +66,14 @@@ matrix
      - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
      ## We check asciidoc with distcheck, to make sure we remove doc products
      - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
 +    ## We check disable module relay
 +    - env: MODULES_OPTIONS="--disable-module-relay"
      ## We check disable module dirauth
      - env: MODULES_OPTIONS="--disable-module-dirauth"
+     ## macOS builds are very slow, and we have a limited number of
+     ## concurrent macOS jobs. We're not actively developing Rust, so it is
+     ## the lowest priority.
      ## We run rust on macOS, because we have seen macOS rust failures before
-     # Disabled due to slow Travis macOS builds, see #32177
      #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
      #  compiler: clang
      #  os: osx