commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

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