[tor-dev] Please merge these anti-fingerprinting bugfixes