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

[nickm at torproject.org]

commit 8f4e5fb66d017187c69650436dcd8dbf83d88f88
Merge: a957249 f5da006
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 09:29:53 2015 -0400

    Merge branch 'ticket14845_03'

 control-spec.txt |   12 ++++++++++++
 1 file changed, 12 insertions(+)