commit fc9eef8d890a4fc97883411db819bc8565a909b7 Merge: 920edee ed7730d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 18 11:22:23 2013 -0400 Merge remote-tracking branch 'desoxy/bug-8596' control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)