commit d851f075971a63ae257f3e11734c8e6e2f0a0263 Merge: 3a6affb15 3b9e3cca9 Author: teor teor@torproject.org Date: Sat Apr 6 09:33:24 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 24 +++++++++++++++++++----- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/bug30011 | 4 ++++ changes/bug30021 | 8 ++++++++ changes/ticket29962 | 3 +++ src/lib/tls/tortls_openssl.c | 2 +- 7 files changed, 43 insertions(+), 7 deletions(-)