]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug32240_32242_035' into bug32240_32242_040
authorteor <teor@torproject.org>
Sun, 15 Dec 2019 23:22:52 +0000 (09:22 +1000)
committerteor <teor@torproject.org>
Sun, 15 Dec 2019 23:22:52 +0000 (09:22 +1000)
Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0

1  2 
.travis.yml

diff --cc .travis.yml
index 1d97e70f514e4ecccb2ae78f8e5ca6734bf6a81f,7f7e7a572356b8612d56d8154c1dfe6a745560d0..c491bab88fd360d67ca37a8a61ba070ec070107b
@@@ -115,9 -115,7 +115,8 @@@ 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
        - asciidoc