Nick Mathewson 212c3acd42 Merge remote-tracking branch 'origin/maint-0.2.2' 14 rokov pred
..
bug4299 cf8bffa359 Discard all cells on a marked connection 14 rokov pred
bug4331 f6b1dc2805 Fix typo, spotted by tmpname0901. Thanks! 14 rokov pred