[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/ticket27402'

[nickm at torproject.org]

commit ce501a529f93658da5576e51c085909d8ecc4fe1
Merge: b65166750 7685f8ad3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 09:37:41 2018 -0500

    Merge remote-tracking branch 'catalyst-github/ticket27402'

 changes/ticket27402                     |  10 +
 src/core/include.am                     |   1 +
 src/feature/control/control.c           | 373 +-------------------------------
 src/feature/control/control.h           |   2 +
 src/feature/control/control_bootstrap.c | 358 ++++++++++++++++++++++++++++++
 5 files changed, 373 insertions(+), 371 deletions(-)