[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket-6236'

[nickm at torproject.org]

commit b0f0c0f5505b3cf4cfbd4a3c1908ace4740f343b
Merge: a324cd902 130e2ffad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 06:42:10 2018 -0400

    Merge remote-tracking branch 'fristonio/ticket-6236'

 changes/ticket6236  |   4 ++
 src/or/transports.c | 182 ++++++++++++++++++++--------------------------------
 2 files changed, 75 insertions(+), 111 deletions(-)