commit fd5b2d0f1c8a83d10e9a07f88cf8d9e69c98774a Merge: 7934dcc6f c8fd7b704 Author: David Goulet dgoulet@torproject.org Date: Wed Jun 24 15:48:47 2020 -0400

Merge branch 'tor-github/pr/1935'

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