tor/changes/bug23696