commit f231827946764c664fbfe7c8ddef2b88d7b6f105 Merge: a6509cb86 8874d1c24 Author: teor teor@torproject.org Date: Mon Feb 17 13:49:23 2020 +1000

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

.travis.yml | 69 ++++++++++++-------- Makefile.am | 183 ++++++++++++++++++++++++++++++++++++++++++---------- changes/ticket28208 | 4 ++ changes/ticket33194 | 4 ++ changes/ticket33195 | 4 ++ changes/ticket33280 | 4 ++ changes/ticket33300 | 3 + changes/ticket33303 | 4 ++ src/test/include.am | 10 +++ 9 files changed, 224 insertions(+), 61 deletions(-)