Merge branch 'tor-github/pr/901' into maint-0.4.0

diff --cc .travis.yml
index d7db65bed3bbf0e1988c55649e16fbdcbeb3a676,498069d827c2df89f945f6752bcc713f99620249..bda1f323e5cba027d0521e4106af918d24257f14
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -209,10 -213,9 +215,11 @@@ script
    - ./configure $CONFIGURE_FLAGS
    ## We run `make check` because that's what https://jenkins.torproject.org does.
    - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
-   - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
+   ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes
+   - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make src/app/tor test-stem; fi
    - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
 +  ## If this build was one that produced coverage, upload it.
 +  - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
  
  after_failure:
    ## configure will leave a log file with more details of config failures.