Etrog for Kiddush and Havdalah
Question
The Talmud/gemara in I believe Shabbat 117b states you should use something for a mitzvah for another mitzvah. Would using leftover etrogim from Sukkot to make wine for kiddush and havdalah fall under this category?