commit cc10873dee71f8250f19e580826f756fa291e197 Merge: b057623be 49ffc0357 Author: Taylor Yu <catalyst@torproject.org> Date: Wed Oct 10 15:01:59 2018 -0500 Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)