tor/changes/bug3318