commit 8374e3e1943166f25f5c96970a4b8ac6101dbfc1 Merge: 37abaa5a1 6d0af8dac Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

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