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

diff --cc .travis.yml
index 2073b853ce1090edfb242f6cbe9c5c784476c245,00c967e341c3ae12bd225c14f5627130317c99f1..c65923d2c4809f16bbdb666ec8a43185b78c109d
--- 1/.travis.yml
--- 2/.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"