Hopefully it's the one from ROTJ. I was kind of bummed in Attack of the Clones when Ani/Obi got their sabres taken by Dooku and just got thrown a couple of other ones by random guy Jedi - and were like, hey no big deal, we can use these. The connection of a Jedi and his saber should be a really big deal, and Luke, unless he figures out some vast improvement on his design, or changes his fighting style over time, should use the same one he made between ESB and ROTJ.
[This message has been edited by MuckRaker96 (edited 8/19/2014 1:27p).]