commit 955a7f52d36e99a96df5e54a2a88dcc2b9931f62 Merge: 70bd4aae6 df519e5de Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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