misapplied/mismerged chunk in 59669b6abf620d1ed2ef4d1e2df25c998b89b64d (master)

2014-12-03 Thread Yuriy Kaminskiy
... and same in cherry-picked variants in other branches: 05e769f269f28b649d8300a1fc3aaef19901a173 (OpenSSL_1_0_2-stable) 4c21e004a3738b70c7d21d6e86ca68b21577d4d0 (OpenSSL_1_0_1-stable) Appears harmless, though. Look for Just one protocol version: diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index

Re: misapplied/mismerged chunk in 59669b6abf620d1ed2ef4d1e2df25c998b89b64d (master)

2014-12-03 Thread Matt Caswell
On 03/12/14 20:36, Yuriy Kaminskiy wrote: ... and same in cherry-picked variants in other branches: 05e769f269f28b649d8300a1fc3aaef19901a173 (OpenSSL_1_0_2-stable) 4c21e004a3738b70c7d21d6e86ca68b21577d4d0 (OpenSSL_1_0_1-stable) Appears harmless, though. Thanks. I'll get this fixed. Matt