[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2

[nickm at torproject.org]

commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c
Merge: 3119cb506 92f1a8af8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 13:09:04 2018 -0400

    Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2

 .travis.yml             | 22 ++++++++++++++++++----
 changes/ticket27252     |  6 ++++++
 changes/ticket27252-032 |  5 +++++
 3 files changed, 29 insertions(+), 4 deletions(-)