diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:23:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:23:46 +1000 |
| commit | 8b5c11fbf6a408147e61ce96812faebca1580c61 (patch) | |
| tree | 19bed6600baf312c8234a19f972c653834a85d24 | |
| parent | da404910a7cb25c20baf3fbf5e7a6a056bdbe9df (diff) | |
| parent | 84c4ede052bc642677d9f53f9802e6d69ca647df (diff) | |
| download | tor-8b5c11fbf6a408147e61ce96812faebca1580c61.tar.gz tor-8b5c11fbf6a408147e61ce96812faebca1580c61.zip | |
Merge branch 'bug32240_32242_041' into bug32240_32242_042
| -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 aee59ed268..368910f1f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,8 +117,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. |