[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8
Merge: 0e7f15fdb 3370b3cfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:42:43 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 .travis.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --cc .travis.yml
index 19bbe6df0,6d314c141..d6450d270
--- a/.travis.yml
+++ b/.travis.yml
@@@ -60,19 -60,28 +60,35 @@@ env
    global:
      ## The Travis CI environment allows us two cores, so let's use both.
      - MAKEFLAGS="-j 2"
 +  matrix:
 +    ## Leave at least one entry here or Travis seems to generate a
 +    ## matrix entry with empty matrix environment variables.  Leaving
 +    ## more than one entry causes unwanted matrix entries with
 +    ## unspecified compilers.
 +    - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
 +    # - RUST_OPTIONS=""
  
  matrix:
-   ## If one build in the matrix fails (e.g. if building withour Rust and Clang
-   ## fails, but building with Rust and GCC is still going), then cancel the
-   ## entire job early and call the whole thing a failure.
-   fast_finish: true
+   ## Uncomment to allow the build to report success (with non-required
+   ## sub-builds continuing to run) if all required sub-builds have
+   ## succeeded.  This is somewhat buggy currently: it can cause
+   ## duplicate notifications and prematurely report success if a
+   ## single sub-build has succeeded.  See
+   ## https://github.com/travis-ci/travis-ci/issues/1696
+   # fast_finish: true
+ 
+   ## Uncomment the appropriate lines below to allow the build to
+   ## report success even if some less-critical sub-builds fail and it
+   ## seems likely to take a while for someone to fix it.  Currently
+   ## Travis CI doesn't distinguish "all builds succeeded" from "some
+   ## non-required sub-builds failed" except on the individual build's
+   ## page, which makes it somewhat annoying to detect from the
+   ## branches and build history pages.  See
+   ## https://github.com/travis-ci/travis-ci/issues/8716
+   allow_failures:
+     # - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+     # - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode
+     # - compiler: clang
  
    ## Create explicit matrix entries to work around a Travis CI
    ## environment issue.  Missing keys inherit from the first list