tor/changes/bug31810