[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/609'

[nickm at torproject.org]

commit e4109020e9b423a170e7ca14d04727bc3730dc67
Merge: 0e6e902cb ab0d7d2dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 20 16:42:35 2018 -0500

    Merge remote-tracking branch 'tor-github/pr/609'

 changes/ticket28180             |   2 +-
 changes/ticket28846             |   3 +
 src/feature/client/transports.c | 140 +++++++++++++++++++++++++++++++++++++---
 src/feature/client/transports.h |   3 +
 src/feature/control/control.c   |  21 ++++--
 src/feature/control/control.h   |   6 +-
 src/test/test_pt.c              |  50 ++++++++++++--
 7 files changed, 202 insertions(+), 23 deletions(-)