commit 685232fe1445d94b64c4e74864406f9c77a8592f Merge: 5b072fd46 4e4b6a247 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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