Ask HN: Good domain registrar with free email and alias hosting

I've used gandi.net for a long time as a domain registrar and email provider for those domains. They used to offer 2 free email boxes and unlimited aliases for each domain. I just found out today that the email and aliases service is being killed.

Does anyone have a preferred registrar that offers free email and unlimited aliases?