[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2

[teor at torproject.org]

commit 92c4dc9b141e4e2e71b68c40c85ef64f20c8344b
Merge: a4790e7d4 b0bf7e7b6
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:51:30 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2

 .travis.yml         | 87 +++++++++++++++++++++++------------------------------
 changes/ticket30860 |  3 ++
 changes/ticket31859 |  3 ++
 3 files changed, 43 insertions(+), 50 deletions(-)

diff --cc .travis.yml
index 2073b853c,00c967e34..c65923d2c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -15,17 -15,13 +15,15 @@@ compiler
  
  os:
    - linux
-   - osx
  
- ## The build matrix in the following stanza expands into builds for each
- ## OS and compiler.
+ ## We don't use the build matrix cross-product, because it makes too many jobs
+ ## Instead, we list each job under matrix: include:
  env:
    global:
 -    ## The Travis CI environment allows us two cores, so let's use both.
 -    - MAKEFLAGS="-j 2"
 +    ## The Travis CI environment allows us two cores, so let's use both.  Also,
 +    ## let's use the "-k" flag so that we get all of the compilation failures,
 +    ## not just the first one.
 +    - MAKEFLAGS="-k -j 2"
      ## We turn on hardening by default
      ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
      - HARDENING_OPTIONS="--enable-expensive-hardening"