Git 2.25.4

This merges up the security fix from v2.17.5. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Jonathan Nieder committed Apr 19, 2020 at 16:31 UTC 7397ca33730626f682845f8691b39c305535611e

No changes.