Wikipedia has refused to censor themselves in China, however, it appears that the Chinese government has unblocked Wikipedia:

"We'll see how long this lasts," said the company on its site. "Chinese Wikipedians have expressed fears about the detrimental effects that a permanent ban would have. First of all, the block deprives a useful resource from the majority of Chinese speakers in the world. Moreover, since Mainland Chinese form a significant portion of the Chinese Wikipedia community (46% of all users in March 2005), a long-term block could severely stunt the growth of Wikipedia similar to the block in June 2004."

The Chinese government still can and indeed appears to be, blocking certain articles within Wikipedia, but Wikipedia itself has consistently refused to take censor Wikipedia themselves. It should be noted that both Google and Yahoo have acceded to Chinese government demands that they filter their searches for the Chinese market.