minor cleanups

diff --git a/src/common/tortls.c b/src/common/tortls.c
index df77fb066f897d9e04d07bb6bde5a4c0ac7b8d59..9adbfa41f1fb2127f191648d4d4172e64215bcac 100644 (file)
--- 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 bae222a191160b7593200a0ddb0860561b52187e..6aa34590cc745b4a08dda3fcfce10b714af5129d 100644 (file)
--- 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 b4fb8d167d93e8e6871ceeabe916f032e801633c..ca932e6af7e001d7755331800ba64b4adbdbe28b 100644 (file)
--- 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)