diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 11:37:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 11:37:56 -0400 |
| commit | b683b9af00b9ddf20f68169f47f8da0b49d6fbc8 (patch) | |
| tree | a9e3a6f628e31f848cdc2f81623683cff18c4ac8 /src | |
| parent | a46f4982c2b05256762f96a40f286881d3195753 (diff) | |
| parent | 1a1d431cff40dd92e43df892b0369cd12c3596fb (diff) | |
| download | tor-b683b9af00b9ddf20f68169f47f8da0b49d6fbc8.tar.gz tor-b683b9af00b9ddf20f68169f47f8da0b49d6fbc8.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/cpuworker.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 09ffdb81d1..d511ecf84c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,6 +178,12 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { + if (!threadpool) { + /* If we're a client, then we won't have cpuworkers, and we won't need + * to tell them to rotate their state. + */ + return; + } if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn, @@ -486,6 +492,8 @@ assign_onionskin_to_cpuworker(or_circuit_t *circ, cpuworker_request_t req; int should_time; + tor_assert(threadpool); + if (!circ->p_chan) { log_info(LD_OR,"circ->p_chan gone. Failing circ."); tor_free(onionskin); |