commit 7a26f14a37dc5ba6b6ef2816a22b6893502726a3 Merge: 56e8d84ea 52b7ae71b Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 7 10:23:44 2019 -0400

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

changes/ticket29669 | 3 +++ src/feature/control/control_cmd.c | 7 ++++--- src/test/test_controller.c | 28 +++++++++++++++------------- 3 files changed, 22 insertions(+), 16 deletions(-)