tor/changes/bug6831