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

Merge branch 'maint-0.3.2' into release-0.3.2

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