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

[nickm at torproject.org]

commit b4d3d46858695b82bcfad668531693d1916ba580
Merge: ab64534 b941a70
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:08:03 2015 -0400

    Merge branch 'feature15006'

 control-spec.txt |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)