summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-24 23:32:24 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-24 23:32:24 +0000
commit0b31d0d4e8197a4de5215d8171bd9f88ffaecd2e (patch)
tree6cbe4ecd6c0a70eec128a0d97a13455f2cb8b550
parent3ace033c0cf6597d8f8ba55fc8067a7ec284a19b (diff)
downloadtor-0b31d0d4e8197a4de5215d8171bd9f88ffaecd2e.tar.gz
tor-0b31d0d4e8197a4de5215d8171bd9f88ffaecd2e.zip
more touch-ups
svn:r1687
-rw-r--r--src/or/main.c2
-rw-r--r--src/or/router.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 49a9554176..3b8eee8707 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -364,7 +364,7 @@ static void run_scheduled_events(time_t now) {
router_upload_dir_desc_to_dirservers();
}
- /* 1b. Every MAX_LINK_KEY_LIFETIME seconds, we change our TLS context. */
+ /* 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */
if (!last_rotated_certificate)
last_rotated_certificate = now;
if (options.ORPort && last_rotated_certificate+MAX_SSL_KEY_LIFETIME < now) {
diff --git a/src/or/router.c b/src/or/router.c
index aed865ada0..b1c8c3f887 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -48,7 +48,7 @@ crypto_pk_env_t *get_identity_key(void) {
/* Replace the previous onion key with the current onion key, and generate
* a new previous onion key. Immediately after calling this function,
* the OR should:
- * a) shedule all previous cpuworker to shut down _after_ processing
+ * a) schedule all previous cpuworkers to shut down _after_ processing
* pending work. (This will cause fresh cpuworkers to be generated.)
* b) generate and upload a fresh routerinfo.
*/
@@ -473,7 +473,6 @@ int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router,
strftime(published, 32, "%Y-%m-%d %H:%M:%S", gmtime(&router->published_on));
- /* XXXX eventually, don't include link key */
result = snprintf(s, maxlen,
"router %s %s %d %d %d\n"
"platform %s\n"