commit a462ca7cce3699f488b5e2f2921738c944cb29c7 Merge: ef9170db4 2d66250d8 Author: David Goulet dgoulet@torproject.org Date: Thu May 30 12:53:52 2019 -0400

Merge branch 'tor-github/pr/1055'

changes/bug30646 | 4 ++++ src/feature/control/control_cmd.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)