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

[nickm at torproject.org]

commit bfab1dda2b66f42216c117a12eef076fefda481e
Merge: 50ad2545c 484b25960
Author: Taylor Yu <catalyst at torproject.org>
Date:   Wed Oct 10 15:17:47 2018 -0500

    Merge branch 'bug27738-034-merged' into bug27738-master-merged

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