--- a/stream.go	Sun Dec 16 15:24:55 2012 -0700
+++ b/stream.go	Sun Dec 16 15:54:39 2012 -0700
@@ -299,7 +299,7 @@
 				break Loop
 			}
 			if x == nil {
-				Info.Logf("Refusing to send nil stanza")
+				Info.Log("Refusing to send nil stanza")
 				continue
 			}
 			srvOut <- x
@@ -317,7 +317,7 @@
 		select {
 		case newFilterOut := <-filterOut:
 			if newFilterOut == nil {
-				Warn.Logf("Received nil filter")
+				Warn.Log("Received nil filter")
 				filterIn <- nil
 				continue
 			}
@@ -381,7 +381,7 @@
 	cl.socketSync.Wait()
 
 	// Negotiate TLS with the server.
-	tls := tls.Client(tcp, nil)
+	tls := tls.Client(tcp, &TlsConfig)
 
 	// Make the TLS connection available to the reader, and wait
 	// for it to signal that it's working again.
@@ -389,7 +389,7 @@
 	cl.socket = tls
 	cl.socketSync.Wait()
 
-	Info.Logf("TLS negotiation succeeded.")
+	Info.Log("TLS negotiation succeeded.")
 	cl.Features = nil
 
 	// Now re-send the initial handshake message to start the new
@@ -446,9 +446,9 @@
 			cl.saslDigest2(srvMap)
 		}
 	case "failure":
-		Info.Logf("SASL authentication failed")
+		Info.Log("SASL authentication failed")
 	case "success":
-		Info.Logf("Sasl authentication succeeded")
+		Info.Log("Sasl authentication succeeded")
 		cl.Features = nil
 		ss := &stream{To: cl.Jid.Domain, Version: Version}
 		cl.xmlOut <- ss
@@ -464,7 +464,7 @@
 		}
 	}
 	if !hasAuth {
-		Warn.Logf("Server doesn't support SASL auth")
+		Warn.Log("Server doesn't support SASL auth")
 		return
 	}
 
@@ -600,10 +600,10 @@
 	f := func(st Stanza) bool {
 		iq, ok := st.(*Iq)
 		if !ok {
-			Warn.Logf("non-iq response")
+			Warn.Log("non-iq response")
 		}
 		if iq.Type == "error" {
-			Warn.Logf("Resource binding failed")
+			Warn.Log("Resource binding failed")
 			return false
 		}
 		var bindRepl *bindIq
@@ -619,7 +619,7 @@
 		}
 		jidStr := bindRepl.Jid
 		if jidStr == nil || *jidStr == "" {
-			Warn.Logf("Can't bind empty resource")
+			Warn.Log("Can't bind empty resource")
 			return false
 		}
 		jid := new(JID)