commit cc55d0a7296a521f6f2fd940480330e22e6ff5ab Merge: 4074b89 9e9d61b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 24 08:28:29 2017 -0400 Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1' control-spec.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)