Nick Mathewson 212c3acd42 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/command.c

2011-10-28 18:02:57 -04:00

..

bug4299

Discard all cells on a marked connection

2011-10-28 17:04:15 -04:00

bug4331

Fix typo, spotted by tmpname0901. Thanks!

2011-10-28 09:52:24 -04:00