commit 7aebf292d61c8af30c9460fbe2bb743d776f6db2 Merge: 39792f430 a7e72f0c4 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 5 10:15:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)