Moved proxy-choosing routine from Cinnamon::Task::HTTP
Merge commit '4ecc07c' into staging
auto-merge staging into master