summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-01-23 20:46:57 -0500
committerNick Mathewson <nickm@torproject.org>2010-01-23 20:46:57 -0500
commit3b4b6009a0020fb55fcb6464cc448e244680f9c8 (patch)
treefb5324e3a40e089f3c204e315409b587e1fab4b1 /src/common
parent2309d0caae3f53adf4f0b8d76785cb058e900e79 (diff)
parentaec4aea19045fa9fe1c80bd032bb97ad06bbf44e (diff)
downloadtor-3b4b6009a0020fb55fcb6464cc448e244680f9c8.tar.gz
tor-3b4b6009a0020fb55fcb6464cc448e244680f9c8.zip
Merge remote branch 'origin/maint-0.2.1'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/tortls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 86f07a270a..4bb2291b1f 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -201,6 +201,8 @@ tls_log_errors(tor_tls_t *tls, int severity, int domain, const char *doing)
if (!state)
state = (st>=0)?ssl_state_to_string(st):"---";
if (!msg) msg = "(null)";
+ if (!lib) lib = "(null)";
+ if (!func) func = "(null)";
if (doing) {
log(severity, domain, "TLS error while %s%s%s: %s (in %s:%s:%s)",
doing, addr?" with ":"", addr?addr:"",