commit 002c5ca5d1986a0fad0c961113e512d47c2edfe0 Merge: c5bbf72fb 44aa586de Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 10:48:18 2018 -0400

Merge branch 'maint-0.3.3'

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