tor/changes/bug9495_redux