tor/changes/bug31696