commit 8b09bafe9c3731fd05fd9617a780d38a65216d35 Merge: e748a5f f4ecd58 Author: teor teor@torproject.org Date: Fri Dec 20 10:01:31 2019 +1000

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

.travis.yml | 153 ++++++++++++++++++++++++++++++++++++++-------------- chutney | 2 +- tests/unit-tests.sh | 14 +++-- 3 files changed, 123 insertions(+), 46 deletions(-)