diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-12-24 23:32:15 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-12-24 23:32:15 +0000 |
| commit | 7cc53c2281955f6e4cb2aae985d91370a33aed10 (patch) | |
| tree | 75997dc571cbdfede41b5ecb389864e6d2a24068 | |
| parent | 35986a23744897b8be4a530629859d353f2bd51c (diff) | |
| download | tor-7cc53c2281955f6e4cb2aae985d91370a33aed10.tar tor-7cc53c2281955f6e4cb2aae985d91370a33aed10.tar.gz | |
clean up some comments
svn:r5644
| -rw-r--r-- | src/or/connection_or.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index d4e64c409..863595b6f 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -447,9 +447,10 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest) switch (connection_connect(conn, conn->address, addr, port)) { case -1: + /* If the connection failed immediately, and we're using + * an https proxy, our https proxy is down. Don't blame the + * Tor server. */ if (!options->HttpsProxy) { - /* If the connection failed immediately, our https proxy - * is down. Don't blame the Tor server. */ router_mark_as_down(conn->identity_digest); helper_node_set_status(conn->identity_digest, 0); } @@ -474,8 +475,8 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest) /** Begin the tls handshake with <b>conn</b>. <b>receiving</b> is 0 if * we initiated the connection, else it's 1. * - * Assign a new tls object to conn->tls, begin reading on <b>conn</b>, and pass - * <b>conn</b> to connection_tls_continue_handshake(). + * Assign a new tls object to conn->tls, begin reading on <b>conn</b>, and + * pass <b>conn</b> to connection_tls_continue_handshake(). * * Return -1 if <b>conn</b> is broken, else return 0. */ |