commit dcc477cb53cda792c433b01c21f45cd4415c984d Merge: 0117e2ea0 fbf93614c Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:35:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

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