commit b3d7a56f2a9ed617c6e22c21544a0a6ceb7b2668 Merge: de5f94000c 35e5b306a0 Author: Alexander Færøy ahf@torproject.org Date: Tue May 25 13:58:55 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/380' into main

src/feature/control/control_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)