commit 709cd447f0b207f969d448bd4fe2d5f2795e678d Merge: 9d75f7984 ccdb7a1cf Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 29 15:59:06 2018 -0400

Merge branch '27913_rebased_035' into maint-0.3.5

.travis.yml | 9 +++++++-- changes/ticket27913 | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-)