nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.0

Browse Source
This commit is contained in:
teor 2019-10-29 08:26:40 +10:00
commit 54e2d0dc2d
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -151,10 +151,11 @@ addons:
## preventing or diagnosing hangs ## preventing or diagnosing hangs
- timelimit - 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 ## 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 ## Default is Xcode 9.4 on macOS 10.13 as of October 2019
#osx_image: xcode9.4 ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019
osx_image: xcode11.2
before_install: before_install:
## Create empty rust directories for non-Rust builds, so caching succeeds ## Create empty rust directories for non-Rust builds, so caching succeeds

2
changes/ticket32241 Normal file
View File

@ -0,0 +1,2 @@
o Testing (continuous integration):
- In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.