commit 042a9fd8b008ad004c2a11ed18298b5cd3b60a37 Merge: 328bcbf30 89c5b8d7d Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.3.4'

.travis.yml | 27 +++++++++++++++++++++------ changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ changes/ticket27252-034 | 3 +++ 4 files changed, 35 insertions(+), 6 deletions(-)