From 704f3224a2058329f23f9567873e77215e441701 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Mon, 16 Dec 2019 09:01:45 +1000
Subject: [PATCH 1/3] Travis: Turn off Tor's Sandbox in Chutney jobs

We need to set "Sandbox 0", until we fix sandbox errors that are
triggered by Ubuntu Xenial and Bionic. See 32722.

Part of 32240.
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6004727b6d..1d56d64d44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ env:
     - HARDENING_OPTIONS="--enable-expensive-hardening"
     ## We turn off asciidoc by default, because it's slow
     - ASCIIDOC_OPTIONS="--disable-asciidoc"
+    ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are
+    ## triggered by Ubuntu Xenial and Bionic. See #32722.
+    - CHUTNEY_TOR_SANDBOX="0"
   matrix:
     ## This matrix entry is required, but it doesn't actually create any jobs
     -

From 0f07d252436bcc3b86c0003ea0a8fe14e13428b0 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Mon, 16 Dec 2019 09:03:48 +1000
Subject: [PATCH 2/3] Travis: Run Chutney jobs in Ubuntu Bionic images

Closes 32240.
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d56d64d44..a67b8b92fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,10 +41,6 @@ matrix:
     ## Use -std=gnu99 to turn off some newer features, and maybe turn on some
     ## extra gcc warnings?
     - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99"
-      ## (Linux only) Use an older Linux image (Ubuntu Trusty)
-      ## The Xenial and Bionic images cause permissions issues for chutney,
-      ## this is a workaround, until we fix #32240.
-      dist: trusty
     ## We check asciidoc with distcheck, to make sure we remove doc products
     ## We use Linux clang, because there are no other Linux clang jobs
     - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"

From 37b04aeed7d6c7acb8b7edf2bcd6ee08f9c3a54c Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Mon, 16 Dec 2019 09:06:25 +1000
Subject: [PATCH 3/3] changes: file for 32240

---
 changes/ticket32240 | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changes/ticket32240

diff --git a/changes/ticket32240 b/changes/ticket32240
new file mode 100644
index 0000000000..35cc3df27e
--- /dev/null
+++ b/changes/ticket32240
@@ -0,0 +1,4 @@
+  o Testing:
+    - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu
+      Bionic. Turning off the Sandbox is a work-around, until we fix the
+      sandbox errors in 32722. Closes ticket 32240.