单项选择题

Mr. Zhang, () came to see me yesterday, is an old friend of my father’s.

A. which    
B. that     
C. who     
D. whom