commit ca9834c5ca906c31a7c3259f4008a4d4d0cf69f1 Merge: 8d3c3f039 ebb0ac338 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.3.1'

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