commit d96b35d6639b1c2f6a57f9d84007544c334c963b Merge: e2f78396f 0b3763612 Author: teor teor@torproject.org Date: Mon Dec 16 09:22:52 2019 +1000

Merge branch 'bug32240_32242_035' into bug32240_32242_040

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

.travis.yml | 3 +-- changes/ticket32242 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc .travis.yml index 1d97e70f5,7f7e7a572..c491bab88 --- 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