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

[nickm at torproject.org]

commit bb012d7941d3e4fd4ad31e3d64e9a820f25c34a2
Merge: b67f3b751 e86593c40
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 09:22:23 2018 -0400

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

 changes/ticket27678           |  5 +++
 src/core/or/command.c         | 37 ++++++++++++++++++++++
 src/feature/control/control.c | 74 +++++++++++++++++++++++++++++--------------
 src/feature/control/control.h |  2 +-
 4 files changed, 94 insertions(+), 24 deletions(-)