commit 2f0e187191216d6dc4a3527e7e3b2bf268d869c0 Merge: 578a93bbb dbf1725a1 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 9 15:46:14 2019 -0500
Merge remote-tracking branch 'tor-github/pr/627'
changes/ticket28757 | 5 +++++ src/feature/control/control.c | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-)