Restore comment header and remove carriage returns
Land #2622 - Fix up proxy/socks4a.rb