commit 36154c13f41f517c7629613d4b58cde23bb9ee1a Merge: 75b544d64 bc0de600b Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

.travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)