aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-02-26 21:25:51 +0000
committerRoger Dingledine <arma@torproject.org>2004-02-26 21:25:51 +0000
commit0b27ae0c2ded4a45e59d8b75d4dc8edc6a68db84 (patch)
treefd32c3b66b7fce64b44d4147e5e735ad9f17e6df /src/or/main.c
parent496e414e5208fe4c196a645e2f64ba712d893f6e (diff)
downloadtor-0b27ae0c2ded4a45e59d8b75d4dc8edc6a68db84.tar
tor-0b27ae0c2ded4a45e59d8b75d4dc8edc6a68db84.tar.gz
if the default torrc isn't there, just use some default defaults
plus provide an internal dirservers file if they don't have one having no config files will make it easier to run on windows svn:r1124
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 511df7763..e67d3c897 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -452,7 +452,8 @@ static int do_main_loop(void) {
int poll_result;
/* load the routers file */
- if(router_set_routerlist_from_file(options.RouterFile) < 0) {
+ if(options.RouterFile &&
+ router_set_routerlist_from_file(options.RouterFile) < 0) {
log_fn(LOG_ERR,"Error loading router list.");
return -1;
}