Added support for SOCKS proxies #16

Merged

Atheros1 merged 6 commits from master into master

2012-12-18 22:52:44 +01:00

Author	SHA1	Message	Date
Jonathan Warren	7a98317439	merged SOCKS branch	2012-12-18 16:44:04 -05:00
Jonathan Warren	6586bd2d6d	further refined SOCKS exception messages	2012-12-18 16:36:37 -05:00
Jonathan Warren	1fdb21693d	minor change to UI	2012-12-18 14:37:37 -05:00
Jonathan Warren	7c69c93f82	SOCKS	2012-12-18 13:32:48 -05:00
Jonathan Warren	33cb1a621a	added can-icon.ico	2012-12-18 13:12:09 -05:00
Jonathan Warren	3411f8f39a	added SOCKS	2012-12-18 13:09:10 -05:00