summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-04-20 02:48:35 -0400
committerRoger Dingledine <arma@torproject.org>2010-04-20 02:48:35 -0400
commit77babb832a128d6479dee5f7e37b03de566c1a14 (patch)
tree3a26a952d6e51cfefa5a4e2ca6f17d3263f10ce1
parentf2c30e97cc61204d43040fc9d82ea114a87afdeb (diff)
downloadtor-77babb832a128d6479dee5f7e37b03de566c1a14.tar.gz
tor-77babb832a128d6479dee5f7e37b03de566c1a14.zip
minor cleanups
-rw-r--r--src/common/tortls.c7
-rw-r--r--src/or/dirvote.c2
-rw-r--r--src/or/routerlist.c5
3 files changed, 7 insertions, 7 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index df77fb066f..9adbfa41f1 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -762,8 +762,7 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
strcmp(ciphername, TLS1_TXT_DHE_RSA_WITH_AES_256_SHA) &&
strcmp(ciphername, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA) &&
strcmp(ciphername, "(NONE)")) {
- /* XXXX should be ld_debug */
- log_info(LD_NET, "Got a non-version-1 cipher called '%s'", ciphername);
+ log_debug(LD_NET, "Got a non-version-1 cipher called '%s'", ciphername);
// return 1;
goto dump_list;
}
@@ -779,8 +778,8 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
smartlist_add(elts, (char*)ciphername);
}
s = smartlist_join_strings(elts, ":", 0, NULL);
- log_info(LD_NET, "Got a non-version-1 cipher list from %s. It is: '%s'",
- address, s);
+ log_debug(LD_NET, "Got a non-version-1 cipher list from %s. It is: '%s'",
+ address, s);
tor_free(s);
smartlist_free(elts);
}
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index bae222a191..6aa34590cc 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2720,7 +2720,7 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
goto err;
}
}
- });
+ });
pending_vote = tor_malloc_zero(sizeof(pending_vote_t));
pending_vote->vote_body = new_cached_dir(tor_strndup(vote_body,
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index b4fb8d167d..ca932e6af7 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -974,8 +974,9 @@ router_get_trusteddirserver_by_digest(const char *digest)
return NULL;
}
-/** Return the trusted_dir_server_t for the directory authority whose identity
- * key hashes to <b>digest</b>, or NULL if no such authority is known.
+/** Return the trusted_dir_server_t for the directory authority whose
+ * v3 identity key hashes to <b>digest</b>, or NULL if no such authority
+ * is known.
*/
trusted_dir_server_t *
trusteddirserver_get_by_v3_auth_digest(const char *digest)