more touch-ups

svn:r1687

diff --git a/src/or/main.c b/src/or/main.c
index 49a955417625eb2ec59abe92690bb8a27cf3b643..3b8eee87070850f6e24acd33f27f28998f2b2730 100644 (file)
--- 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 aed865ada0c82f875f4a86273a884e9925ef08fa..b1c8c3f8872aba772b4cfc5904c763aacbade246 100644 (file)
--- 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"