Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Added/merged some traces. Improved Socks identification