From 9f3e3d2b7121dbcf054decc9fe922b05c5afe326 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Tue, 9 Nov 2004 07:29:05 +0000
Subject: [PATCH] stop wanting to split init_keys()
svn:r2735
---
src/or/main.c | 2 --
src/or/router.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/or/main.c b/src/or/main.c
index 7125b8c5ad..e549a89d3e 100644
--- 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 75f2fe6a41..c20cc96dd7 100644
--- 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()))
--
GitLab