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

[nickm at torproject.org]

commit 1ee8ed4b63859313a8b720bb91f60375f7f26aad
Merge: 5c64d56a4 fbf93614c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:38:48 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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