commit 89a3fafd49c046c3cd1c9c34f7db4798272f9ffb Merge: 9187cdb1c 5cc3a0379 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

.travis.yml | 5 ++++- changes/travis_distcheck | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)