From: teor <teor@torproject.org>
Date: Sun, 15 Dec 2019 23:22:52 +0000 (+1000)
Subject: Merge branch 'bug32240_32242_035' into bug32240_32242_040
X-Git-Tag: tor-0.4.1.8~8^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d96b35d6639b1c2f6a57f9d84007544c334c963b;p=thirdparty%2Ftor.git

Merge branch 'bug32240_32242_035' into bug32240_32242_040

Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
---

d96b35d6639b1c2f6a57f9d84007544c334c963b
diff --cc .travis.yml
index 1d97e70f51,7f7e7a5723..c491bab88f
--- a/.travis.yml
+++ b/.travis.yml
@@@ -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