Merge tcp_input.c:1.292, tcp_timer.c:1.77 from HEAD to RELENG_6:
Explicitly assert socket pointer is non-NULL in tcp_input() so as to provide better debugging information. Prefer explicit comparison to NULL for tcpcb pointers rather than treating them as booleans.