commit 34e7dca9c9e902a58fe8942cef666f1d99d06030 Merge: 9727b4c5d 612513371 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 10:38:19 2018 -0400

Merge branch 'travis_distcheck_029' into maint-0.2.9

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