commit 0bef3a21cc749550e47dfeaadb9843e91567e841 Merge: 0dcf29793 5a8827a4c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 22 ++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 29 insertions(+), 4 deletions(-)