aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-12-20 10:12:43 +1000
committerteor <teor@torproject.org>2019-12-20 10:12:43 +1000
commit72376378714fef727004830157da79be97821a60 (patch)
tree99bbfb6d774d9319f70bc64ffd749323b680aae7 /changes
parentffccf6fc55f691e01ccd3e756486415cbc7ffe8a (diff)
parentd96b35d6639b1c2f6a57f9d84007544c334c963b (diff)
downloadtor-72376378714fef727004830157da79be97821a60.tar.gz
tor-72376378714fef727004830157da79be97821a60.zip
Merge branch 'maint-0.4.0' into maint-0.4.1
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket322404
-rw-r--r--changes/ticket322422
2 files changed, 6 insertions, 0 deletions
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.
diff --git a/changes/ticket32242 b/changes/ticket32242
new file mode 100644
index 0000000000..d63d5a586e
--- /dev/null
+++ b/changes/ticket32242
@@ -0,0 +1,2 @@
+ o Testing (continuous integration):
+ - Use zstd in our Travis Linux builds. Closes ticket 32242.