[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] clean up some comments
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
connection_or.c
Log Message:
clean up some comments
Index: connection_or.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -d -r1.204 -r1.205
--- connection_or.c 14 Dec 2005 20:40:40 -0000 1.204
+++ connection_or.c 24 Dec 2005 23:32:15 -0000 1.205
@@ -447,9 +447,10 @@ connection_or_connect(uint32_t addr, uin
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, uin
/** 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.
*/