[tor-commits] [torspec/master] Merge branch 'bug7619'

[nickm at torproject.org]

commit 42bf05b266a160c09d392eae2aaacb4d947320de
Merge: 41c93e4 4528b69
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 15 13:09:58 2013 -0400

    Merge branch 'bug7619'

 control-spec.txt |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)