Incorporated Psiphon's Polipo changes into Polipo 1.1.0
Merge pull request #1 from adam-p/master

Incorporated Psiphon's Polipo changes into Polipo 1.1.0