commit da5c8277eacc3a18234373228da1397f36112e19 Merge: 49a11f8a8 6ed3d8dbd Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 24 08:01:43 2019 -0400 Merge branch 'ticket31372_029' into ticket31372_035 .travis.yml | 6 ++++-- changes/ticket31372_travis | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-)