fix -6 params not work on client. fix IPv6 support
Merge pull request #36 from ZeR0-Wu/master

fix IPv6 support and the '-6' option
add obfs3
Merge branch 'master' of https://github.com/clowwindy/shadowsocks

Conflicts:
	local.py
Merge remote-tracking branch 'ch3n2k/master'