commit 198b6354e6c58ab4276461b5215487b8e9c15683 Merge: 19429fac2 7cea5a287 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:08:57 2018 -0400

Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9

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