[tor-commits] [torspec/master] Merge remote-tracking branch 'dgoulet/ticket14847_11'

[nickm at torproject.org]

commit 40dc315c8011f5abc2991fca3addc2b76aad1d7a
Merge: 8f4e5fb aaf2434
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 12:25:43 2015 -0400

    Merge remote-tracking branch 'dgoulet/ticket14847_11'

 control-spec.txt |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)