- various null checks and other small fixes from upstream - upstream changes for the renegotiation info according to the latest draft