Citigroup reaches aid deal with government