commit 337204915479dab7057f73319866bfa63205c58e Merge: f59b10750 89c5b8d7d Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:09:21 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
.travis.yml | 27 +++++++++++++++++++++------ changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ changes/ticket27252-034 | 3 +++ 4 files changed, 35 insertions(+), 6 deletions(-)