commit 7936065770c1431efb39f3ce6815743fb6efa13a Merge: 6a0694f 48f6dd0 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Aug 25 11:34:14 2013 -0400 Merge remote-tracking branch 'asn/bug7317' control-spec.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)