Yup, the non-carrier-locked GSM model.
I realize it seems like they're just dicking around with this stuff now, but it's getting more and more serious -- the speed of the TB unlock was largely assisted by luck. At some point HTC will take it the next further step and adopt an effectively unbreakable system like Moto, and it'll be game over. Being an HTC fanboy has been one of those "authentic Android" badges among the hardcore for a while, but apparently they don't love you back. It sucks, of course. I'm not sure what the upside to the company is -- if it's idiot returns they could just make it easy to unlock but have the warranty void permanently at that point...
I realize it seems like they're just dicking around with this stuff now, but it's getting more and more serious -- the speed of the TB unlock was largely assisted by luck. At some point HTC will take it the next further step and adopt an effectively unbreakable system like Moto, and it'll be game over. Being an HTC fanboy has been one of those "authentic Android" badges among the hardcore for a while, but apparently they don't love you back. It sucks, of course. I'm not sure what the upside to the company is -- if it's idiot returns they could just make it easy to unlock but have the warranty void permanently at that point...