commit 0945235ff84a59fcb1bb13760aa1966f341ac6b8 Merge: 164263fc5 3370b3cfe Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)