[tor-commits] [torspec/master] Merge remote-tracking branch 'rransom-tor/safecookie-v2'

[nickm at torproject.org]

commit cd85eef84f0bc47e014dac63bde8271e5401678e
Merge: 6a860e9 4f92a35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 14:11:51 2012 -0400

    Merge remote-tracking branch 'rransom-tor/safecookie-v2'

 control-spec.txt |  100 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 89 insertions(+), 11 deletions(-)