commit 75aae8d19a898ff71ef532024cac81592bccd43d Merge: 757f6dc b91918e Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 23 01:25:03 2011 -0400 Merge branch 'feature3049-squashed' control-spec.txt | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-)