[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3

[nickm at torproject.org]

commit 8e714d2a025618a7618b3b756e5ef96dea7496b8
Merge: 8afc100cb ae2085dd7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 13:09:09 2018 -0400

    Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3

 .travis.yml             | 23 +++++++++++++++++++----
 changes/ticket27252     |  6 ++++++
 changes/ticket27252-032 |  5 +++++
 3 files changed, 30 insertions(+), 4 deletions(-)