Nick Mathewson 6be596e2dc Merge remote-tracking branch 'origin/maint-0.2.2' ... Conflicts: src/or/config.c		2011-10-29 09:22:58 -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
bug4340	Add a changes file for the 4340 fix	2011-10-29 11:21:37 +02:00
bug4343	Fix a double-free that would occur on an invalid cert in a CERTS cell	2011-10-28 16:38:56 -04:00