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

[teor at torproject.org]

commit e1955a2c54e2c9ab25252c46f13f0a222828a6ff
Merge: 54e249e26 f0cd8f804
Author: teor <teor at torproject.org>
Date:   Sat Apr 6 09:28:13 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

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