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)).

mentioned in merge request !30 (merged)

mentioned in merge request tor-browser-build!27 (merged)

closed via merge request !30 (merged)

changed time estimate to 15m

added 15m of time spent at 2020-08-11