tor

commit 7dd59460941c50242e740ff0cbd84b588d66e26e
parent b7b467d3af7b32a5e2ae218dd9344c303a0a4935
Author: teor <teor@torproject.org>
Date:   Mon, 16 Dec 2019 08:13:38 +1000

Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9

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

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -49,9 +49,8 @@ matrix:
     ## We include a single coverage build with the best options for coverage
     - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
     ## 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
 
   ## Allow the build to report success (with non-required sub-builds
   ## continuing to run) if all required sub-builds have succeeded.
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.
diff --git a/changes/ticket32629 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.