don't assume the presence of a proxy
Merge pull request #567 from lukfugl/master

don't assume the presence of a proxy