diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:27:39 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:27:39 -0500 |
commit | 88642bbdc783d8616ba779dbd33378e2c4e09501 (patch) | |
tree | 38996c7e8b882c057972b20ff1cc398b5db11959 | |
parent | 2a7cad957263f5faed3a0b9de8b15d9794a5541c (diff) | |
parent | c38157be9d8fc7de9c6fc0c58e3bc8481a1d48a4 (diff) | |
download | tor-88642bbdc783d8616ba779dbd33378e2c4e09501.tar.gz tor-88642bbdc783d8616ba779dbd33378e2c4e09501.zip |
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r-- | src/or/scheduler_kist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index a50be345b0..19a8db5170 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -286,8 +286,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * more in the kernel for now. */ ent->limit = 0; } else { - /* Adding two positive int64_t together will always fit in an uint64_t. - * And we know this will always be positive. */ + /* The positive sum of two int64_t will always fit into an uint64_t. + * And we know this will always be positive, since we checked above. */ ent->limit = (uint64_t)tcp_space + (uint64_t)extra_space; } return; |