[tor-commits] [torspec/master] Merge remote-tracking branch 'krkahn/bug1692'

[nickm at torproject.org]

commit 9fdd1107f8cac126877ad936b960cf05b6092d24
Merge: 7b8a7fb 74f21a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 10 15:07:30 2011 -0400

    Merge remote-tracking branch 'krkahn/bug1692'

 control-spec.txt |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)