commit edbfcee2f252191a3892850d749a1416b4ae5357 Merge: 2fd489d61 34e7dca9c Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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