commit 717507e3bb38d11814f4128ed7ccde676ab2aa89 Merge: 119df9c1c e8c7d7d3b Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 10 17:12:11 2018 -0400 Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9 .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-)