diff options
author | teor <teor@torproject.org> | 2019-12-16 09:23:41 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-12-16 09:23:41 +1000 |
commit | 84c4ede052bc642677d9f53f9802e6d69ca647df (patch) | |
tree | 99bbfb6d774d9319f70bc64ffd749323b680aae7 | |
parent | 4a34fd5b746fcbd712607323cb48cfcd6e72456f (diff) | |
parent | d96b35d6639b1c2f6a57f9d84007544c334c963b (diff) | |
download | tor-84c4ede052bc642677d9f53f9802e6d69ca647df.tar.gz tor-84c4ede052bc642677d9f53f9802e6d69ca647df.zip |
Merge branch 'bug32240_32242_040' into bug32240_32242_041
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | changes/ticket32242 | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8d68629ea6..375796799b 100644 --- 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 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. |