commit 4557f3f9089633e1442d7e955421c65d1e26bcff Merge: 3ada086d3 ebb0ac338 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

.travis.yml | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug22636 | 8 +++++ 2 files changed, 107 insertions(+)