Merge branch 'maint'

* maint:
count-delta: match get_delta_hdr_size() changes.
check patch_delta bounds more carefully

diff --cc sha1_file.c
Simple merge