diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:16:04 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:16:04 +1000 |
| commit | 748117298341de8a279f4437b6d557f0d50edb63 (patch) | |
| tree | 327c5745de2595e780f027c347cc78766c6f3a84 /changes | |
| parent | b9504f788c9798fab2b74d4006ba9b97151d6404 (diff) | |
| parent | 1cd20ff848eab6ee7b441c5aab0578ab02a114bc (diff) | |
| download | tor-748117298341de8a279f4437b6d557f0d50edb63.tar.gz tor-748117298341de8a279f4437b6d557f0d50edb63.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
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. |