commit c77162e4e95fdfd6a5cc422802dee943750b14b7 Merge: 27965f1ef da5c8277e Author: teor teor@torproject.org Date: Wed Oct 23 08:32:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5

.appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-)

diff --cc .travis.yml index 1523ba8ca,64f8380bc..8f7e8e4be --- a/.travis.yml +++ b/.travis.yml @@@ -15,13 -15,17 +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"