Add timeout handling to proxy.
Merged with repository.

Conflicts:
	network/socks.go