commit c7ca7a93807cc2cae7b8369ebc1fb0682291bd1b Merge: c41944d06 4ab033c3b Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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