tor/changes/bug40316