tor/changes/bug31003