diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-09-05 02:34:58 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-09-05 02:34:58 -0400 |
| commit | 86907ea4db5067d1fbf56275457a919d6789ba95 (patch) | |
| tree | d37c00248b7e9a1f1c9194604a85a4bcf2a90fd4 /src/or/cpuworker.c | |
| parent | 6156887adfa724805f90b3b7cf2be6213f08a450 (diff) | |
| parent | 2c877d2da4a989639311de11e4ada8dd03bc8187 (diff) | |
| download | tor-86907ea4db5067d1fbf56275457a919d6789ba95.tar.gz tor-86907ea4db5067d1fbf56275457a919d6789ba95.zip | |
Merge branch 'maint-0.2.4'
Diffstat (limited to 'src/or/cpuworker.c')
| -rw-r--r-- | src/or/cpuworker.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 61f9faa394..ecf0d2035d 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -19,9 +19,11 @@ #include "circuitlist.h" #include "config.h" #include "connection.h" +#include "connection_or.h" #include "cpuworker.h" #include "main.h" #include "onion.h" +#include "rephist.h" #include "router.h" /** The maximum number of cpuworker processes we will keep around. */ @@ -683,6 +685,9 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, return -1; } + if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest)) + rep_hist_note_circuit_handshake_completed(onionskin->handshake_type); + should_time = should_time_request(onionskin->handshake_type); memset(&req, 0, sizeof(req)); req.magic = CPUWORKER_REQUEST_MAGIC; |