commit beaaeecd2057f3decb59a44318437b32e90afbf0 Merge: 3f2cf1c0f 5cc3a0379 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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