commit 1dbb6d6fbbae3dd939f54166971282fa7d6063b3 Merge: 3379222 b12d0a0 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Aug 11 10:02:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/32' control-spec.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)