Update git2 and cargo snapshots

Should fix #1032 and #1029