tor/changes/bug2704_part2