[tor-commits] [tor/master] merge in the safecookie changelog entry too