Merge trunk. tlsBIO.c is now fully equal to trunk.