diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:21:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:21:05 +1000 |
| commit | 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 (patch) | |
| tree | 39a871ebac11be126eabd442faf0c2e00e6bec52 | |
| parent | 75096de4c7ade9d8e734017d46714378bf3ae94c (diff) | |
| parent | 43424866496e6f7613ec652c798fec3b8b460c6d (diff) | |
| download | tor-0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8.tar.gz tor-0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8.zip | |
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
| -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 6ed69f5fb6..7f7e7a5723 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 ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc 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. |