单项选择题

It was not until last year ___________ he came to live in this city.
A、when
B、what
C、which
D、that