target to PyOpenSSL
Merge pull request #119 from wwqgtxx/patch-11

send change to 3.1 branch
eat SSLError
make socketserver happy
target to python 2.7
update goagent.exe
clean master
add readme
Merge remote-tracking branch 'upstream/master' into 3.0

Conflicts:
	.gitignore
	local/SwitchyOptions.bak
	local/addto-startup.py
	local/goagent-gtk.py
	local/goagent-osx.command
	local/goagent.exe
	local/proxy.bat
	local/proxy.ini
	local/proxy.pac
	local/proxy.py
	local/python27.dll
	local/python27.exe
	local/python27.zip
	local/uvent.bat
	server/gae/app.yaml
	server/gae/robots.txt
	server/php/index.php
	server/uploader.zip