commit cc4c1840a6a7fe6e5ff91ce391f6a920fabe0b86 Merge: 18734d3b2 f226d6460 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:37:06 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

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