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

[teor at torproject.org]

commit 2afba291bbfc79198e1cd62382a30168f45db4e5
Merge: b0428b6dc 48e990359
Author: teor <teor at torproject.org>
Date:   Sat Apr 6 09:33:15 2019 +1000

    Merge branch 'maint-0.3.4' into release-0.3.4

 .travis.yml         | 15 +++++++++++----
 Makefile.am         |  4 +++-
 changes/bug29036    |  5 +++++
 changes/bug30021    |  8 ++++++++
 changes/ticket29962 |  3 +++
 src/common/tortls.c |  2 +-
 6 files changed, 31 insertions(+), 6 deletions(-)