tor/changes/bug4567_2