tor/changes/bug9671_023