tor/changes/bug6815