[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit d5000fc673c77e06db413a22d456621933e0bd1a
Merge: b83991fce d3ff12630
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 17 10:47:13 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml       | 9 ++++++++-
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)