tor/changes/ticket40921