[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

[teor at torproject.org]

commit 102178e6d43ed990e972b2fbc4f611997c8943f0
Merge: 3cfcfbac4 a514e0247
Author: teor <teor at torproject.org>
Date:   Sat Apr 6 09:30:04 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

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