Merge remote-tracking branch 'ms/tor' into tor