[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5

[teor@xxxxxxxxxxxxxx]

commit 15d67842f9c1cb993491cf473478999dace7c6c2
Merge: e03db9934 752c35ca9
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Tue Oct 29 08:26:32 2019 +1000

    Merge branch 'maint-0.2.9' into maint-0.3.5

 .travis.yml         | 7 ++++---
 changes/ticket32241 | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc .travis.yml
index 4ded5e25a,4ea9400b8..7f0e78587
--- a/.travis.yml
+++ b/.travis.yml
@@@ -145,19 -106,13 +145,20 @@@ addons
        ## Always installed, because manual brew installs are hard to get right
        - asciidoc
        - xmlto
 +      ## Utilities
 +      ## preventing or diagnosing hangs
 +      - timelimit
  
- ## (OSX only) Use the default OSX image
+ ## (OSX only) Use a recent macOS image
  ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
- ## Default is Xcode 9.4 on macOS 10.13 as of August 2018
- #osx_image: xcode9.4
+ ## Default is Xcode 9.4 on macOS 10.13 as of October 2019
+ ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019
+ osx_image: xcode11.2
  
 +before_install:
 +  ## Create empty rust directories for non-Rust builds, so caching succeeds
 +  - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi
 +
  install:
    ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux)
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits