diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-02-06 15:42:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-06 15:42:53 -0500 |
| commit | e36faeec1d40e1f4f7ae54c798ad4492f86f594c (patch) | |
| tree | e2a61fc6d4fcb09fa6aeb1db652f9575e816acea /src/or/connection.c | |
| parent | b3bc8712140b8268cb3714b17b9678eefe66e90e (diff) | |
| parent | e0c3de40ad557be4ed059e93695391e44aa7a16c (diff) | |
| download | tor-e36faeec1d40e1f4f7ae54c798ad4492f86f594c.tar.gz tor-e36faeec1d40e1f4f7ae54c798ad4492f86f594c.zip | |
Merge remote-tracking branch 'sebastian/bug13993'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 0ce4f72209..79ae178a56 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1601,7 +1601,6 @@ connection_init_accepted_conn(connection_t *conn, return 0; } - static int connection_connect_sockaddr(connection_t *conn, const struct sockaddr *sa, @@ -1688,11 +1687,10 @@ connection_connect_sockaddr(connection_t *conn, *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } - return inprogress ? 0 : 1; + return inprogress ? 0 : 1; } - /** Take conn, make a nonblocking socket; try to connect to * addr:port (they arrive in *host order*). If fail, return -1 and if * applicable put your best guess about errno into *<b>socket_error</b>. |