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

[nickm at torproject.org]

commit 0ad5a6b034df39df8cc390ee32042d4cb0683b93
Merge: 715185477 09618bc48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:34:56 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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