Martin Grabmueller a285eb345c Merge remote-tracking branch 'upstream/next' into client-certificate ... Conflicts: Network/TLS/Context.hs Network/TLS/Record/Disengage.hs		2012-07-26 23:17:08 +02:00
..
Disengage.hs	Merge remote-tracking branch 'upstream/next' into client-certificate	2012-07-26 23:17:08 +02:00
Engage.hs	Fix broken negotiation by separating active from pending crypt/mac states.	2012-07-18 17:32:26 +02:00
Types.hs	expand tabs.	2012-03-27 08:57:51 +01:00