[tor-commits] [obfs-flash/master] Merge branch 'fix-w32-kill'