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

[nickm at torproject.org]

commit 4ab033c3bc94950ffe442c5f7b5a87f3f3382996
Merge: 0ea622aa3 67bdd144b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 5 09:56:19 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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