commit a7e72f0c44f42145ff39c1ef77fb131c25569732 Merge: 67bdd144b 57b207efa Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 5 10:15:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)