Tribler/tribler — pull request #1090 by LipuFei (2014-12-29 14:25:40+00:00)
Title: fix proxy settings for normal downloads

Should fix #1010