commit 95f06d61d09b81039ee44ec7329e9d37fdc75ba0 Merge: 7df92c0e0 1d8957129 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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