commit 7fe169a5000d56f081191f4ca073453f2dc3610b Merge: 217db9efe db71bceb4 Author: George Kadianakis desnacked@riseup.net Date: Fri Apr 5 14:55:09 2019 +0300

Merge branch 'tor-github/pr/879' into maint-0.4.0

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