Merge pull request #66 from rc0r/master
authorOrakaro <DTVD@users.noreply.github.com>
Sat, 4 Oct 2014 06:47:26 +0000 (15:47 +0900)
committerOrakaro <DTVD@users.noreply.github.com>
Sat, 4 Oct 2014 06:47:26 +0000 (15:47 +0900)
commit49a95766f33c88d43165ca937dee47791f513b9e
tree9045a5f32dd9997fe0247ff250ab9f0cd938206e
parent72f58edbf0bd853f8cb5a2a0f25d48de5c0e8268
parent89e6bf4b2de0cb0ab4be0d405067a92041bb9879
Merge pull request #66 from rc0r/master

HTTP/SOCKS proxy support added (resolves DTVD/rainbowstream#60)