Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  close_sha1_file(): make it easier to diagnose errors
  avoid possible overflow in delta size filtering computation

diff --cc builtin-pack-objects.c
Simple merge

diff --cc sha1_file.c
Simple merge