Merge branch 'maint-0.2.3'

This commit is contained in:
Roger Dingledine
2012-11-12 23:49:37 -05:00
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -1218,7 +1218,7 @@ run_scheduled_events(time_t now)
if (router_rebuild_descriptor(1)<0) {
log_info(LD_CONFIG, "Couldn't rebuild router descriptor");
}
if (advertised_server_mode() & !options->DisableNetwork)
if (advertised_server_mode() && !options->DisableNetwork)
router_upload_dir_desc_to_dirservers(0);
}