commit 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca Merge: a28c14aad 2b1b8bf2c Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

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