Nick Mathewson 6be596e2dc Merge remote-tracking branch 'origin/maint-0.2.2' %!s(int64=15) %!d(string=hai) anos
..
bug4299 cf8bffa359 Discard all cells on a marked connection %!s(int64=15) %!d(string=hai) anos
bug4331 f6b1dc2805 Fix typo, spotted by tmpname0901. Thanks! %!s(int64=15) %!d(string=hai) anos
bug4340 c5c5f859d3 Add a changes file for the 4340 fix %!s(int64=15) %!d(string=hai) anos
bug4343 c2a098e980 Fix a double-free that would occur on an invalid cert in a CERTS cell %!s(int64=15) %!d(string=hai) anos