commit 39792f430a90849202039f8fc8fa0bc9dc7a18b6 Merge: 6b3b59ad7 67bdd144b Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

.travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)