summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-28 12:21:08 +1000
committerteor <teor@torproject.org>2019-11-28 12:21:08 +1000
commitf2f7491cd9ea8a8c39b576106b44488202aa3c63 (patch)
tree123ff2cce00f336f6b73265b022ec217f3e396cc /changes
parent453e092e521626420fb679ad99fade0dd1c9af88 (diff)
parent99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d (diff)
downloadtor-f2f7491cd9ea8a8c39b576106b44488202aa3c63.tar.gz
tor-f2f7491cd9ea8a8c39b576106b44488202aa3c63.zip
Merge branch 'ticket32629_029' into ticket32629_035
Merge re-enable chutney from ticket32629_029 with stem from maint-0.3.5.
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket321773
1 files changed, 0 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.