commit b2b59b06c8a2d548453302413241d7f663f6c39c Merge: 2ffdf43e7 1cf11b694 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 19 10:18:59 2018 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

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