Little fix copied from Jelmer's integration branch, want to import the rest

after doing this devel release because there are quite a lot of changes in
it.

2 files changed, 2 insertions, 1 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 8fb53608..3f509c46 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -21,6 +21,7 @@ Version 1.1dev:
 - Many, many, MANY little changes, improvements, fixes. Using non-blocking
   I/O as much as possible, fixed lots of little bugs (including bugs that
   affected daemon mode stability). See the bzr logs for more information.
+- Added units tests, will have to add some more before the real release.
 - Most important change: New file format for user data (accounts, nicks and
   settings). Migration to the new format should happen transparently,
   BitlBee will read the old files and once you quit/save it will save in the
diff --git a/lib/url.c b/lib/url.c
index e4deac78..c6fdc4c8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -99,7 +99,7 @@ int url_set( url_t *url, char *set_url )
 			url->port = 80;
 		else if( url->proto == PROTO_HTTPS )
 			url->port = 443;
-		else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS4 )
+		else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS5 )
 			url->port = 1080;
 	}