torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug32240_32242_035' into bug32240_32242_040

Browse Source 
Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
This commit is contained in:
teor
2019-12-16 09:22:52 +10:00
parent e2f78396f4 0b3763612c
commit d96b35d663
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -2
View File
@@ -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
changes/ticket32242
+2
View File
@@ -0,0 +1,2 @@
o Testing (continuous integration):
- Use zstd in our Travis Linux builds. Closes ticket 32242.