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)
HTTP/SOCKS proxy support added (resolves DTVD/rainbowstream#60)


Trivial merge