commit f6faa7681730f877ede2493a0be6c59c4c9ec9e5 Merge: fda8b5de7 709cd447f Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 29 15:59:11 2018 -0400

Merge branch 'maint-0.3.5'

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