Merge branch 'maint-0.3.3'

This commit is contained in:
Nick Mathewson 2018-03-23 17:49:29 -04:00
commit d749f6b5f6

View File

@ -1953,7 +1953,9 @@ should_rotate_descriptors(hs_service_t *service, time_t now)
"time is %ld (now: %ld). Valid after time from "
"consensus is %ld",
service->desc_current, service->desc_next,
service->state.next_rotation_time, now, ns->valid_after);
(long)service->state.next_rotation_time,
(long)now,
(long)ns->valid_after);
goto no_rotation;
}
goto rotation;