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

[nickm at torproject.org]

commit bfbeb55469b2fa59f7488acf64f2b300a7bac0fe
Merge: f24797a58 46dca2732
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 20:01:08 2018 -0400

    Merge branch 'maint-0.3.4'

 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)