Merge remote-tracking branch 'rransom-tor/safecookie-022-v3' into maint-0.2.2
commit6dcbfec82d1a76cf19dd385b1b91841189c8c4ab
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 18:03:29 +0000 (26 14:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 18:03:29 +0000 (26 14:03 -0400)
treec7c88f7f54a3d425e764f56bb7fead0613c5257f
parent650e2aac46ed9857eed1863cefda45c632bb21eb
parente111e371b4f44456182e7f237837a0f9466487cd
Merge remote-tracking branch 'rransom-tor/safecookie-022-v3' into maint-0.2.2