commit 2b1b8bf2cad4af304d38f88e38047dadddd7e0be Merge: b40f9967f 4e4b6a247 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

.travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)