commit ca0089066bcf3eedd59fd194413d8d4e740eb3e5 Merge: bcac0bb34 a0db5ade3 Author: teor <teor@torproject.org> Date: Sat Apr 6 09:33:06 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 5 files changed, 22 insertions(+), 5 deletions(-)