commit a1243864f263fdf9bc815ab31fa785f84d1b4b8d Merge: 4b14ff45f be5b4415c Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)