tor/changes/bug31615