commit 62194caa0565881178a784fe7662e5c9aa6c5b56 Merge: 14ba43f92 8682442c7 Author: teor teor@torproject.org Date: Wed Oct 23 08:46:57 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

.travis.yml | 6 ++++-- changes/ticket31001 | 6 ++++++ changes/ticket31372_travis | 4 ++++ src/common/compat.c | 8 ++++---- 4 files changed, 18 insertions(+), 6 deletions(-)