commit 72ef4f43d5a2e09bc7544b7090a8fc0992adba02 Merge: 7edd01a29 5612eccef Author: George Kadianakis desnacked@riseup.net Date: Wed Jun 26 10:57:24 2019 +0300

Merge branch 'tor-github/pr/1142'

changes/ticket30889 | 3 + src/feature/control/control_auth.c | 8 +-- src/feature/control/control_cmd.c | 86 +++++++++++++---------------- src/feature/control/control_cmd.h | 5 +- src/feature/control/control_proto.c | 5 +- src/feature/control/control_proto.h | 4 +- src/test/test_controller.c | 106 ++++++++++++++++++++++-------------- 7 files changed, 115 insertions(+), 102 deletions(-)