commit 7e17c24381495f6eaf648b56e5239a7954fbd4ef Merge: cd160291a 55b25ee6c Author: teor teor@torproject.org Date: Fri Dec 20 10:12:18 2019 +1000

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

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