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

[nickm at torproject.org]

commit 2f618094d25db35436a1e6962f4f8393d6470a08
Merge: 824160fd8 4ab033c3b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 5 09:56:19 2018 -0400

    Merge branch 'maint-0.3.4'

 .travis.yml      | 6 +++---
 changes/bug27453 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)