[tor-commits] [tor/master] Merge branch 'bug27738-033' into bug27738-034

[nickm at torproject.org]

commit 484b259604175a7cac313346b8574a36c70b66b7
Merge: 48182c147 cc10873de
Author: Taylor Yu <catalyst at torproject.org>
Date:   Wed Oct 10 15:13:02 2018 -0500

    Merge branch 'bug27738-033' into bug27738-034

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