commit 46bccc50e53b1adde2065ad3ccf6ff538674c630 Merge: 8a873a569 da17875ea Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:09:18 2018 -0400

Merge remote-tracking branch 'teor/ticket27252-034' into 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(-)