commit d96cef1baa7b36125807b2cb95b70cccb3aa09b8 Merge: b69fe15b5 198b6354e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

.travis.yml | 13 +++++++++++-- changes/ticket27252 | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-)