[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 09618bc48884255d6d3dbc8b156fe025817d9402
Merge: 78dfa76dd 6d0af8dac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:34:40 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

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