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