commit 578a93bbbc9ecb6fa67aead760bfeb40e7977d39 Merge: 0ed966fde 4bc3983f6 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 9 09:49:25 2019 -0500

Merge branch 'ticket28843'

changes/ticket28843 | 3 +++ src/feature/control/control.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+)