[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 2e9fbab843db2f3cdf1dad9207cdff7933d2d07c
Merge: 07d44bea0 0ad5a6b03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:38:48 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

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