diff options
| author | teor <teor@torproject.org> | 2019-12-16 08:14:04 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 08:14:04 +1000 |
| commit | 05908d57f64a4365f6715f19aba51ccd5849e635 (patch) | |
| tree | 657642256be59b0bf3b4b1491198e9766f5699e9 /changes | |
| parent | 0c4f0ec977823021a71b6951fa43d2ffb2315cdb (diff) | |
| parent | a277f28947900fc2018f634078bf59eae166c75a (diff) | |
| download | tor-05908d57f64a4365f6715f19aba51ccd5849e635.tar.gz tor-05908d57f64a4365f6715f19aba51ccd5849e635.zip | |
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
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. |