Merge remote-tracking branch 'public/bug1031'

This commit is contained in:
Nick Mathewson
2012-10-15 11:20:48 -04:00
115 changed files with 1372 additions and 1363 deletions
+1 -1
View File
@@ -250,7 +250,7 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
}
circ = or_circuit_new(cell->circ_id, chan);
circ->_base.purpose = CIRCUIT_PURPOSE_OR;
circ->base_.purpose = CIRCUIT_PURPOSE_OR;
circuit_set_state(TO_CIRCUIT(circ), CIRCUIT_STATE_ONIONSKIN_PENDING);
if (cell->command == CELL_CREATE) {
char *onionskin = tor_malloc(ONIONSKIN_CHALLENGE_LEN);