diff options
author | teor <teor@torproject.org> | 2019-12-16 08:16:24 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-12-16 08:16:24 +1000 |
commit | d5702a6340104434fe1d82a340c74b2393a1f8aa (patch) | |
tree | ace01a58b7816a1f6aaf330d05da7149cd94c9b2 /changes | |
parent | ee4375a98545aa12acc511ccde21de7a0af56043 (diff) | |
parent | bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 (diff) | |
download | tor-d5702a6340104434fe1d82a340c74b2393a1f8aa.tar.gz tor-d5702a6340104434fe1d82a340c74b2393a1f8aa.zip |
Merge branch 'maint-0.4.2' into release-0.4.2
Diffstat (limited to 'changes')
-rw-r--r-- | changes/ticket32629 | 4 |
1 files changed, 4 insertions, 0 deletions
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. |