diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-15 20:19:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-15 20:19:53 -0500 |
| commit | 3d7bf98d13ffc090e5ba1b918f53668018690dce (patch) | |
| tree | 82908c4a835bc9559996fe068466441e5dc78112 /src/or/circuituse.c | |
| parent | 3c8a481599cf9c84530db1f304731b5f2ec9caef (diff) | |
| parent | 7884ce76e100abc220ddedb76c9b98d22d66d645 (diff) | |
| download | tor-3d7bf98d13ffc090e5ba1b918f53668018690dce.tar.gz tor-3d7bf98d13ffc090e5ba1b918f53668018690dce.zip | |
Merge remote-tracking branch 'valentecaio/t-24714'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc9c4bccbd..5fa11a802a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2584,7 +2584,7 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, log_debug(LD_APP|LD_CIRC, "attaching new conn to circ. n_circ_id %u.", (unsigned)circ->base_.n_circ_id); /* reset it, so we can measure circ timeouts */ - ENTRY_TO_CONN(apconn)->timestamp_lastread = time(NULL); + ENTRY_TO_CONN(apconn)->timestamp_last_read_allowed = time(NULL); ENTRY_TO_EDGE_CONN(apconn)->next_stream = circ->p_streams; ENTRY_TO_EDGE_CONN(apconn)->on_circuit = TO_CIRCUIT(circ); /* assert_connection_ok(conn, time(NULL)); */ |