|
@@ -1277,18 +1277,6 @@ options_act(or_options_t *old_options)
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
- /* We want to reinit keys as needed before we do much of anything else:
|
|
|
- keys are important, and other things can depend on them. */
|
|
|
- if (running_tor &&
|
|
|
- (transition_affects_workers ||
|
|
|
- (options->V3AuthoritativeDir && (!old_options ||
|
|
|
- !old_options->V3AuthoritativeDir)))) {
|
|
|
- if (init_keys() < 0) {
|
|
|
- log_warn(LD_BUG,"Error initializing keys; exiting");
|
|
|
- return -1;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
if (consider_adding_dir_authorities(options, old_options) < 0)
|
|
|
return -1;
|
|
|
|
|
@@ -1333,6 +1321,17 @@ options_act(or_options_t *old_options)
|
|
|
finish_daemon(options->DataDirectory);
|
|
|
}
|
|
|
|
|
|
+ /* We want to reinit keys as needed before we do much of anything else:
|
|
|
+ keys are important, and other things can depend on them. */
|
|
|
+ if (transition_affects_workers ||
|
|
|
+ (options->V3AuthoritativeDir && (!old_options ||
|
|
|
+ !old_options->V3AuthoritativeDir))) {
|
|
|
+ if (init_keys() < 0) {
|
|
|
+ log_warn(LD_BUG,"Error initializing keys; exiting");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/* Write our PID to the PID file. If we do not have write permissions we
|
|
|
* will log a warning */
|
|
|
if (running_tor && options->PidFile)
|