tor/changes/bug6979