[tor-commits] [torspec/master] Merge remote-tracking branch 'public/bug10449'

[nickm at torproject.org]

commit 707ee6b0f65d4f6a1c11feb359b068d4a366ae26
Merge: d425c35 faac8a4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 25 16:11:46 2014 -0500

    Merge remote-tracking branch 'public/bug10449'

 control-spec.txt |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)