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

Merge branch 'maint-0.3.3' into release-0.3.3

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