tor/changes/bug31898