commit f40eb2ead6f166f3f478eabe8766856056169a5a Merge: aff286618 7a5eefd3f Author: teor teor@torproject.org Date: Fri Oct 25 16:14:37 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1462'

.travis.yml | 6 ++ Makefile.am | 73 ++++++++------- changes/ticket31919 | 13 +++ scripts/coccinelle/check_cocci_parse.sh | 52 +++++++++++ scripts/coccinelle/exceptions.txt | 24 +++++ scripts/coccinelle/try_parse.sh | 25 +++++- scripts/git/pre-commit.git-hook | 78 +++++++++++----- scripts/git/pre-push.git-hook | 153 ++++++++++++++++++-------------- 8 files changed, 301 insertions(+), 123 deletions(-)