[tor-commits] [tor/master] Merge branch 'bug32240_32242_042' into bug32240_32242_master

[teor at torproject.org]

commit 55b25ee6c632a603c3a83e83deee396868289be7
Merge: 86ca3194a 8b5c11fbf
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 09:25:38 2019 +1000

    Merge branch 'bug32240_32242_042' into bug32240_32242_master
    
    Merge:
    * libzstd-dev from ticket32242_042
    * coccinelle from master

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

diff --cc .travis.yml
index f007838a9,368910f1f..ccd2107fd
--- a/.travis.yml
+++ b/.travis.yml
@@@ -119,10 -117,7 +119,9 @@@ addons
        - libnss3-dev
        - libscrypt-dev
        - libseccomp-dev
-       ## zstd doesn't exist in Ubuntu Trusty
-       #- libzstd
+       - libzstd-dev
 +      ## Optional build dependencies
 +      - coccinelle
        - shellcheck
        ## Conditional build dependencies
        ## Always installed, so we don't need sudo