commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 ++-- changes/ticket25714 | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)