[or-cvs] r14187: backport r14165 (tor/branches/tor-0_2_0-patches/src/common)

[arma at seul.org]

Author: arma
Date: 2008-03-25 21:45:35 -0400 (Tue, 25 Mar 2008)
New Revision: 14187

Modified:
   tor/branches/tor-0_2_0-patches/src/common/tortls.c
Log:
backport r14165


Modified: tor/branches/tor-0_2_0-patches/src/common/tortls.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/common/tortls.c	2008-03-25 23:11:08 UTC (rev 14186)
+++ tor/branches/tor-0_2_0-patches/src/common/tortls.c	2008-03-26 01:45:35 UTC (rev 14187)
@@ -622,7 +622,7 @@
 
 #ifdef V2_HANDSHAKE_SERVER
 /** Return true iff the cipher list suggested by the client for <b>ssl</b> is
- * a list that indicates that the client know how to do the v2 TLS connection
+ * a list that indicates that the client knows how to do the v2 TLS connection
  * handshake. */
 static int
 tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
@@ -666,7 +666,7 @@
     }
     s = smartlist_join_strings(elts, ":", 0, NULL);
     log_info(LD_NET, "Got a non-version-1 cipher list from %s.  It is: '%s'",
-             s, address);
+             address, s);
     tor_free(s);
     smartlist_free(elts);
   }