[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

commit 5ac28787700862d242e74aab338db2a484f4c106 Merge: f9f6718c5 7fe169a50 Author: George Kadianakis <desnacked@riseup.net> Date: Fri Apr 5 14:55:22 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 15 +++++++++++---- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ changes/ticket29962 | 3 +++ 4 files changed, 22 insertions(+), 5 deletions(-)