public marks

PUBLIC MARKS from dszalkowski with tags ssh & "tcp wrapper"