[tor-commits] [torspec/master] Merge remote-tracking branch 'rransom/bug2411a-v2'

[nickm at torproject.org]

commit 50c33cb3591eaa15afa1948e1c926381d9963ff4
Merge: 06a4623 2f040bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 22 10:59:26 2011 -0500

    Merge remote-tracking branch 'rransom/bug2411a-v2'

 control-spec.txt |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 74 insertions(+), 4 deletions(-)