[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 06c14f920900f99935e0cf6072aeb50231464eba
Merge: 75da2045c 2b0416366
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 5 10:16:11 2018 -0400

    Merge branch 'maint-0.3.4'

 .travis.yml      | 2 +-
 changes/bug27418 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)