commit 09219047631c4375c20a6b60d14dfed108bec895 Merge: 70624a3be ffaf180b7 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 10 17:12:34 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 51 ++++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 34 insertions(+), 21 deletions(-)