commit 6dcbfec82d1a76cf19dd385b1b91841189c8c4ab Merge: 650e2aa e111e37 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 26 14:03:29 2012 -0400

Merge remote-tracking branch 'rransom-tor/safecookie-022-v3' into maint-0.2.2

src/or/connection.c | 1 + src/or/control.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/or.h | 6 ++ 3 files changed, 164 insertions(+), 2 deletions(-)