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

[nickm at torproject.org]

commit 8f872e9459411e558719ef91edf8c2fe02344c43
Merge: 8464f4433 f7e93cf2e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 17:12:34 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml         | 51 ++++++++++++++++++++++++++++++---------------------
 changes/ticket27738 |  4 ++++
 2 files changed, 34 insertions(+), 21 deletions(-)