diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-07-17 16:19:32 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-07-17 16:19:32 -0400 |
commit | e2b744ce38edb8901cff3288634c4ebb5b4568b9 (patch) | |
tree | 9af8bf64a8ed5412ea7b55bd08f3e390867ce770 /src/feature/hs/hs_common.c | |
parent | 12afdcc15a8429bcc50d9287321849b6fa924c2f (diff) | |
parent | 14b507e5207ce7e581c5fc773921f8cf65d08247 (diff) | |
download | tor-e2b744ce38edb8901cff3288634c4ebb5b4568b9.tar.gz tor-e2b744ce38edb8901cff3288634c4ebb5b4568b9.zip |
Merge branch 'bug25552_ope_squashed'
Diffstat (limited to 'src/feature/hs/hs_common.c')
-rw-r--r-- | src/feature/hs/hs_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index 723cfa6ea8..328430be08 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1102,8 +1102,7 @@ hs_in_period_between_tp_and_srv,(const networkstatus_t *consensus, time_t now)) /* Get start time of next TP and of current SRV protocol run, and check if we * are between them. */ valid_after = consensus->valid_after; - srv_start_time = - sr_state_get_start_time_of_current_protocol_run(valid_after); + srv_start_time = sr_state_get_start_time_of_current_protocol_run(); tp_start_time = hs_get_start_time_of_next_time_period(srv_start_time); if (valid_after >= srv_start_time && valid_after < tp_start_time) { |