diff --git a/src/or/buffers.c b/src/or/buffers.c
index ed39bc0f82..17d3399635 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1400,7 +1400,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
                 "Tor only an IP address. Applications that do DNS resolves "
                 "themselves may leak information. Consider using Socks4A "
                 "(e.g. via privoxy or socat) instead. For more information, "
-                "please see http://wiki.noreply.org/noreply/TheOnionRouter/"
+                "please see https://wiki.torproject.org/TheOnionRouter/"
                 "TorFAQ#SOCKSAndDNS.%s", req->port,
                 safe_socks ? " Rejecting." : "");
             /*have_warned_about_unsafe_socks = 1;*/
@@ -1513,7 +1513,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
                  "only an IP address. Applications that do DNS resolves "
                  "themselves may leak information. Consider using Socks4A "
                  "(e.g. via privoxy or socat) instead. For more information, "
-                 "please see http://wiki.noreply.org/noreply/TheOnionRouter/"
+                 "please see https://wiki.torproject.org/TheOnionRouter/"
                  "TorFAQ#SOCKSAndDNS.%s", req->port,
                  safe_socks ? " Rejecting." : "");
         /*have_warned_about_unsafe_socks = 1;*/  /*(for now, warn every time)*/
diff --git a/src/or/config.c b/src/or/config.c
index 5137f74792..087a907e48 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2948,7 +2948,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
        !strcmpstart(uname, "Windows Me"))) {
     log(LOG_WARN, LD_CONFIG, "Tor is running as a server, but you are "
         "running %s; this probably won't work. See "
-        "http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ServerOS "
+        "https://wiki.torproject.org/TheOnionRouter/TorFAQ#ServerOS "
         "for details.", uname);
   }
 
diff --git a/src/or/directory.c b/src/or/directory.c
index daf2a15762..0f9cef53df 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -881,7 +881,7 @@ directory_get_consensus_url(int supports_conditional_consensus)
 
   if (supports_conditional_consensus) {
     char *authority_id_list;
-    smartlist_t *authority_digets = smartlist_create();
+    smartlist_t *authority_digests = smartlist_create();
 
     SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
                       trusted_dir_server_t *, ds,
@@ -893,10 +893,10 @@ directory_get_consensus_url(int supports_conditional_consensus)
         hex = tor_malloc(2*CONDITIONAL_CONSENSUS_FPR_LEN+1);
         base16_encode(hex, 2*CONDITIONAL_CONSENSUS_FPR_LEN+1,
                       ds->v3_identity_digest, CONDITIONAL_CONSENSUS_FPR_LEN);
-        smartlist_add(authority_digets, hex);
+        smartlist_add(authority_digests, hex);
       });
-    smartlist_sort(authority_digets, _compare_strs);
-    authority_id_list = smartlist_join_strings(authority_digets,
+    smartlist_sort(authority_digests, _compare_strs);
+    authority_id_list = smartlist_join_strings(authority_digests,
                                                "+", 0, NULL);
 
     len = strlen(authority_id_list)+64;
@@ -904,8 +904,8 @@ directory_get_consensus_url(int supports_conditional_consensus)
     tor_snprintf(url, len, "/tor/status-vote/current/consensus/%s.z",
                  authority_id_list);
 
-    SMARTLIST_FOREACH(authority_digets, char *, cp, tor_free(cp));
-    smartlist_free(authority_digets);
+    SMARTLIST_FOREACH(authority_digests, char *, cp, tor_free(cp));
+    smartlist_free(authority_digests);
     tor_free(authority_id_list);
   } else {
     url = tor_strdup("/tor/status-vote/current/consensus.z");
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 0156e273be..409c2fed69 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2183,7 +2183,7 @@ dirvote_get_pending_consensus(void)
 }
 
 /** Return the signatures that we know for the consensus that we're currently
- * trying to build */
+ * trying to build. */
 const char *
 dirvote_get_pending_detached_signatures(void)
 {
diff --git a/src/or/dns.c b/src/or/dns.c
index 8d00d23eee..c6f9e8b833 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1461,8 +1461,8 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl,
     }
     log(dns_wildcard_one_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider gave an answer for \"%s\", which "
-        "is not supposed to exist.  Apparently they are hijacking "
-        "DNS failures. Trying to correct for this.  We've noticed %d "
+        "is not supposed to exist. Apparently they are hijacking "
+        "DNS failures. Trying to correct for this. We've noticed %d "
         "possibly bad address%s so far.",
         string_address, strmap_size(dns_wildcard_response_count),
         (strmap_size(dns_wildcard_response_count) == 1) ? "" : "es");
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 573197a53f..e78aefc5fa 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1154,7 +1154,7 @@ update_consensus_networkstatus_fetch_time(time_t now)
     }
     if (dl_interval < 1)
       dl_interval = 1;
-    /* We must not try to replace c while it's still the most valid: */
+    /* We must not try to replace c while it's still fresh: */
     tor_assert(c->fresh_until < start);
     /* We must download the next one before c is invalid: */
     tor_assert(start+dl_interval < c->valid_until);
diff --git a/src/or/relay.c b/src/or/relay.c
index e5ba6f4035..eb18bbaade 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -992,7 +992,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
   relay_header_unpack(&rh, cell->payload);
 //  log_fn(LOG_DEBUG,"command %d stream %d", rh.command, rh.stream_id);
   num_seen++;
-  log_debug(domain, "Now seen %d relay cells here.", num_seen);
+  log_debug(domain, "Now seen %d relay cells here (command %d, stream %d).",
+            num_seen, rh.command, rh.stream_id);
 
   if (rh.length > RELAY_PAYLOAD_SIZE) {
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,