summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-09 14:01:08 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-09 14:01:08 -0400
commitf684b48b5be5515395846d089a386167e76f895a (patch)
tree1cb7a59f98455c4aa2d6c96e4c85e32be25ca02d /src/or/connection.c
parent61d5ce83a1ecc459798b530730316bfebe3bb192 (diff)
parent0abf09b2cea9e2af5a9d743b78447021213d02ab (diff)
downloadtor-f684b48b5be5515395846d089a386167e76f895a.tar.gz
tor-f684b48b5be5515395846d089a386167e76f895a.zip
Merge branch 'ticket26009'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 4361e1ca0c..1b15260801 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3440,7 +3440,7 @@ int
connection_handle_read(connection_t *conn)
{
int res;
-
+ update_current_time(time(NULL));
res = connection_handle_read_impl(conn);
return res;
}
@@ -3983,6 +3983,7 @@ int
connection_handle_write(connection_t *conn, int force)
{
int res;
+ update_current_time(time(NULL));
conn->in_connection_handle_write = 1;
res = connection_handle_write_impl(conn, force);
conn->in_connection_handle_write = 0;