tor/changes/refactor_reached_eof