[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1

[nickm at torproject.org]

commit ebb0ac3385d80c545f049442b1db6a84ff581aad
Merge: 1a907c659 810bbb791
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:38:23 2017 -0400

    Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1

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