commit 4d157075f9fbf9c41bba9c6197bb295dc045d724 Merge: 004a125e1 f226d6460 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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