tor

commit d96b35d6639b1c2f6a57f9d84007544c334c963b
parent e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85
Author: teor <teor@torproject.org>
Date:   Mon, 16 Dec 2019 09:22:52 +1000

Merge branch 'bug32240_32242_035' into bug32240_32242_040

Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0

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

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -115,8 +115,7 @@ addons:
       - libnss3-dev
       - libscrypt-dev
       - libseccomp-dev
-      ## zstd doesn't exist in Ubuntu Trusty
-      #- libzstd
+      - libzstd-dev
       - shellcheck
       ## Conditional build dependencies
       ## Always installed, so we don't need sudo
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.