git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@1 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
original version by Dan Haim

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@2 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fixed artifact 2859645 from SF

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@3 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fixed artifact 2771292 from SF

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@4 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fixed artifact 1654331 from SF

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@5 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fixed artifact 2954091 from SF

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@6 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fixed artifact 3003360 from SF

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@7 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
improved setup script

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@8 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
change the name and version so it's not confused with the original module

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@9 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
replaced tabs with spaces and normalized the eol style

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@10 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@11 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
Fixed artifact 2820530 from Sourceforge, thanks to Christopher Gilbert for the code (see http://pyloris.sourceforge.net/)

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@12 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@13 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
normalized tabs

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@14 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
fix for python 2.4

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@15 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
a better fix for the encode/decode issue

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@16 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
Added generic module wrapper. Reworked SOCKS code to work properly across all versions of Python.

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@17 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
Updated version number for distutils.

git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@18 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
now there is no infinite loop in http_negotiate function


git-svn-id: http://socksipy-branch.googlecode.com/svn/trunk@19 9d7bb7c4-1145-faf0-e654-d8b76b9b5611
Merge branch 'socksipy'

Conflicts:
	socks.py