tor

commit f2f7491cd9ea8a8c39b576106b44488202aa3c63
parent 453e092e521626420fb679ad99fade0dd1c9af88
Author: teor <teor@torproject.org>
Date:   Thu, 28 Nov 2019 12:21:08 +1000

Merge branch 'ticket32629_029' into ticket32629_035

Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.

Diffstat:
M
.travis.yml
 | 
5
++---
D
changes/ticket32177
 | 
3
---

2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -67,9 +67,8 @@ matrix:
       compiler: clang
       os: osx
     ## We run chutney on macOS, because macOS Travis has IPv6
-    # Disabled due to slow Travis macOS builds, see #32177
-    #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
-    #  os: osx
+    - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
+      os: osx
     ## We clone our stem repo and run `make test-stem`
     - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
 
diff --git a/changes/ticket32177 b/changes/ticket32177
@@ -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.