diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:13:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:13:38 +1000 |
| commit | 7dd59460941c50242e740ff0cbd84b588d66e26e (patch) | |
| tree | 04bd7dd48db8cec28ac7e23fc790ec3561ac063e /changes | |
| parent | b7b467d3af7b32a5e2ae218dd9344c303a0a4935 (diff) | |
| parent | b84e7715daba5bdcb20fa3f1148d2c518ea5704c (diff) | |
| download | tor-7dd59460941c50242e740ff0cbd84b588d66e26e.tar.gz tor-7dd59460941c50242e740ff0cbd84b588d66e26e.zip | |
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/ticket32177 | 3 | ||||
| -rw-r--r-- | changes/ticket32629 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changes/ticket32177 b/changes/ticket32177 deleted file mode 100644 index 6d6816acde..0000000000 --- a/changes/ticket32177 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing: - - Disable all but one Travis CI macOS build, to mitigate slow scheduling - of Travis macOS jobs. Closes ticket 32177. diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 0000000000..740746c572 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629. |