diff options
| author | teor <teor@torproject.org> | 2019-12-16 09:25:38 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-16 09:25:38 +1000 |
| commit | 55b25ee6c632a603c3a83e83deee396868289be7 (patch) | |
| tree | 46c4f8653d733a48c408a89cd809fab80fd84025 | |
| parent | 86ca3194aac91d8558a0269e3ef341b07c2b1602 (diff) | |
| parent | 8b5c11fbf6a408147e61ce96812faebca1580c61 (diff) | |
| download | tor-55b25ee6c632a603c3a83e83deee396868289be7.tar.gz tor-55b25ee6c632a603c3a83e83deee396868289be7.zip | |
Merge branch 'bug32240_32242_042' into bug32240_32242_master
Merge:
* libzstd-dev from ticket32242_042
* coccinelle from master
| -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 f007838a90..ccd2107fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,8 +119,7 @@ addons: - libnss3-dev - libscrypt-dev - libseccomp-dev - ## zstd doesn't exist in Ubuntu Trusty - #- libzstd + - libzstd-dev ## Optional build dependencies - coccinelle - shellcheck 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. |