commit 148540c505bfcdf6680df8fc20de5362b0666298 Merge: d8114a1f5 85cd8386f Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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