stop wanting to split init_keys()

svn:r2735

diff --git a/src/or/main.c b/src/or/main.c
index 7125b8c5ad22ac6439f6539c352f5abb1ca63be6..e549a89d3e80648fcc0d4993590bca0a24dcec3c 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -704,8 +704,6 @@ static int do_hup(void) {
     return -1;
   }
   options = get_options();
-/*XXX this should move to options_act, but only once it's been
- * removed from init_keys() */
   if(authdir_mode(options)) {
     /* reload the approved-routers file */
     tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", options->DataDirectory);

diff --git a/src/or/router.c b/src/or/router.c
index 75f2fe6a4111d79c2905fa054a6602049918ab2c..c20cc96dd76957a0418e612acd90c577f9035d69 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -239,7 +239,7 @@ int init_keys(void) {
   if (!key_lock)
     key_lock = tor_mutex_new();
 
-  /* OP's don't need persistant keys; just make up an identity and
+  /* OP's don't need persistent keys; just make up an identity and
    * initialize the TLS context. */
   if (!server_mode(options)) {
     if (!(prkey = crypto_new_pk_env()))