Merge branch 'maint-2.35' into maint-2.36

diff --cc attr.c
Simple merge

diff --cc attr.h
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc t/t0003-attributes.sh
Simple merge

diff --cc t/t1450-fsck.sh
Simple merge