tor/changes/bug6844