Nick Mathewson 5a2d0fbe64 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/control.c

2012-03-26 18:51:37 -04:00

..

safecookie

Safe cookie authentication gets a changes file

2012-03-26 14:06:27 -04:00