Since ticket legacy/trac#2428 is an https-everywhere conflict, and since it is due to an issue in channel cancelation, we should update https-everywhere to NoScript's latest channel replacement code, in case there is a fix Giorgio has done that helps us. At the very least, if we also have to fix https-everywhere, patching against the lastest NoScript will make it easier to give the patch to Giorgio for NoScript users (who will also be experiencing the same conflict, but for fewer sites).