From: teor <teor@torproject.org>
Date: Fri, 25 Oct 2019 00:56:06 +0000 (+1000)
Subject: Merge branch 'maint-0.4.0' into maint-0.4.1
X-Git-Tag: tor-0.4.1.7~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63581d55a691e56cde121194558db8a139ab9e74;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0' into maint-0.4.1
---

63581d55a691e56cde121194558db8a139ab9e74
diff --cc .travis.yml
index 7347ae5dfe,0eeaecdae3..a3b17fed7e
--- a/.travis.yml
+++ b/.travis.yml
@@@ -45,8 -45,16 +45,16 @@@ matrix
        compiler: clang
      ## We run chutney on Linux, because it's faster than chutney on macOS
      - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+       ## (Linux only) Use an older Linux image (Ubuntu Trusty)
+       ## The Xenial and Bionic images cause permissions issues for chutney,
+       ## this is a workaround, until we fix #32240.
+       dist: trusty
+     ## We check asciidoc with distcheck, to make sure we remove doc products
+     ## We use Linux clang, because there are no other Linux clang jobs
+     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
+       compiler: clang
      ## We include a single coverage build with the best options for coverage
 -    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
 +    - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765"
      ## We run rust on Linux, because it's faster than rust on macOS
      ## We check rust offline
      - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true