tor

commit 75096de4c7ade9d8e734017d46714378bf3ae94c
parent 1cd20ff848eab6ee7b441c5aab0578ab02a114bc
Author: teor <teor@torproject.org>
Date:   Mon, 16 Dec 2019 09:09:16 +1000

Merge branch 'bug32240_029' into bug32240_035

Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5

Diffstat:
M
.travis.yml
 | 
7
+++----
A
changes/ticket32240
 | 
4
++++

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,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
     -
@@ -49,10 +52,6 @@ matrix:
     ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang
     - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
       compiler: clang
-      ## (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"
diff --git a/changes/ticket32240 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.