commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 19 10:17:05 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

.travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)