commit 85719b79b71eb5a4ef889272a393aa97bbc86134 Merge: 9d1c7c3a8 bc0de600b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)