Handle late handshake messages gracefully
2 files changed