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

[nickm at torproject.org]

commit 788c44308670a36c5676f5a49f90e1fa2cf5387e
Merge: ce6a7e1ff cd2be4283
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 2 13:38:47 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 .travis.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)