nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug32240_32242_042' into bug32240_32242_master

Browse Source 
Merge:
* libzstd-dev from ticket32242_042
* coccinelle from master
This commit is contained in:
teor 2019-12-16 09:25:38 +10:00
commit 55b25ee6c6
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -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

2
changes/ticket32242 Normal file
View File

@ -0,0 +1,2 @@
o Testing (continuous integration):
- Use zstd in our Travis Linux builds. Closes ticket 32242.