commit 000ce239756182c6e38543c07a45c81001def0c7 Merge: e541f2a 5a9cd80 Author: Nick Mathewson <nickm@torproject.org> Date: Sun May 27 12:10:22 2018 -0400 Merge remote-tracking branch 'mikeperry/ticket26110' control-spec.txt | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)