summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-12-20 10:12:47 +1000
committerteor <teor@torproject.org>2019-12-20 10:12:47 +1000
commit69d7ea4db963155e6133bc724d4639ea1bd31d1c (patch)
tree0f36ac7e197fe6e6ab1a28c6639ce1e0a1c38acd /changes
parent7c2e1f6ddd116eefc9f65f0536a5f3b1f5735966 (diff)
parent72376378714fef727004830157da79be97821a60 (diff)
downloadtor-69d7ea4db963155e6133bc724d4639ea1bd31d1c.tar.gz
tor-69d7ea4db963155e6133bc724d4639ea1bd31d1c.zip
Merge branch 'maint-0.4.1' into release-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.