commit 44ea341117ef9f439d7ba9eae74a7a225646bfa3 Merge: 4aa02d3c7 db71bceb4 Author: teor teor@torproject.org Date: Sat Apr 6 09:30:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

.travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)