Adjustments to libgit2 0.21.0