Backport patches for bug 1651680 for now

We need to backport glandium's work for now to enable stripped Windows builds again (see: tor-browser-build#40017 (closed)).