tor/changes/bug31107