Changeset 2288705 for lib/proxy.c

Timestamp:

2009-12-07T21:54:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head.

File:

• lib/proxy.c (modified) (1 diff)

lib/proxy.c

@@ -558 +558 @@
                 return proxy_connect_socks5(host, port, phb);
         
-        if (phb->host) g_free(phb);
         g_free(phb);
         return -1;