tor

commit 55b25ee6c632a603c3a83e83deee396868289be7
parent 86ca3194aac91d8558a0269e3ef341b07c2b1602
Author: teor <teor@torproject.org>
Date:   Mon, 16 Dec 2019 09:25:38 +1000

Merge branch 'bug32240_32242_042' into bug32240_32242_master

Merge:
* libzstd-dev from ticket32242_042
* coccinelle from master

Diffstat:
M
.travis.yml
 | 
3
+--
A
changes/ticket32242
 | 
2
++

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -119,8 +119,7 @@ addons:
       - libnss3-dev
       - libscrypt-dev
       - libseccomp-dev
-      ## zstd doesn't exist in Ubuntu Trusty
-      #- libzstd
+      - libzstd-dev
       ## Optional build dependencies
       - coccinelle
       - shellcheck
diff --git a/changes/ticket32242 b/changes/ticket32242
@@ -0,0 +1,2 @@
+  o Testing (continuous integration):
+    - Use zstd in our Travis Linux builds. Closes ticket 32242.