nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

forward-port the --hash-password bug, plus other nearby fixes

Browse Source 
svn:r4459
This commit is contained in:
Roger Dingledine 2005-06-19 08:35:46 +00:00
parent cc57e1cab1
commit b5fd75a063
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/main.c
View File

@ -963,6 +963,13 @@ do_main_loop(void)
{ {
int loop_result; int loop_result;
/* only spawn dns handlers if we're a router */
if (server_mode(get_options())) {
dns_init(); /* initialize the dns resolve tree, and spawn workers */
}
handle_signals(1);
/* load the private keys, if we're supposed to have them, and set up the /* load the private keys, if we're supposed to have them, and set up the
* TLS context. */ * TLS context. */
if (! identity_key_is_set()) { if (! identity_key_is_set()) {
@ -1313,14 +1320,6 @@ tor_init(int argc, char *argv[])
log_fn(LOG_WARN,"You are running Tor as root. You don't need to, and you probably shouldn't."); log_fn(LOG_WARN,"You are running Tor as root. You don't need to, and you probably shouldn't.");
#endif #endif
/* only spawn dns handlers if we're a router */
if (server_mode(get_options()) && get_options()->command == CMD_RUN_TOR) {
dns_init(); /* initialize the dns resolve tree, and spawn workers */
/* XXX really, this should get moved to do_main_loop */
}
handle_signals(1);
crypto_global_init(); crypto_global_init();
if (crypto_seed_rng()) { if (crypto_seed_rng()) {
log_fn(LOG_ERR, "Unable to seed random number generator. Exiting."); log_fn(LOG_ERR, "Unable to seed random number generator. Exiting.");