tor/changes/bug24634