[or-cvs] stop wanting to split init_keys()

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	main.c router.c 
Log Message:
stop wanting to split init_keys()


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -d -r1.360 -r1.361
--- main.c	9 Nov 2004 07:05:53 -0000	1.360
+++ main.c	9 Nov 2004 07:29:05 -0000	1.361
@@ -704,8 +704,6 @@
     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);

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/src/or/router.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- router.c	9 Nov 2004 07:12:31 -0000	1.114
+++ router.c	9 Nov 2004 07:29:05 -0000	1.115
@@ -239,7 +239,7 @@
   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()))