Merge pull request #1 from adam-p/master

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

Incorporated Android changes
Merge pull request #3 from adam-p/master

Added Psiphon-specific README
Merge branch 'master' of github.com:Psiphon-Inc/polipo