diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:22:52 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:22:52 +1000 |
| commit | d96b35d6639b1c2f6a57f9d84007544c334c963b (patch) | |
| tree | 01f213f810ce81efbd3808024c2472ea78910966 | |
| parent | e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85 (diff) | |
| parent | 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8 (diff) | |
| download | tor-d96b35d6639b1c2f6a57f9d84007544c334c963b.tar.gz tor-d96b35d6639b1c2f6a57f9d84007544c334c963b.zip | |
Merge branch 'bug32240_32242_035' into bug32240_32242_040
Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
| -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 1d97e70f51..c491bab88f 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. |