Merge branch 'FireFox317-deadlock-windows-fix'

Merges #7861
b56e916fa1Andrew Kelley committed on 1/24/2021, 7:22:51 PMparents15278b72b321c2
2 files changedLine totals unavailable