Merge branch 'maint'

* maint:
Further 1.5.3.5 fixes described in release notes
Avoid invoking diff drivers during git-stash
attr: fix segfault in gitattributes parsing code
Define NI_MAXSERV if not defined by operating system
Ensure we add directories in the correct order
Avoid scary errors about tagged trees/blobs during git-fetch

diff --cc attr.c
Simple merge

diff --cc builtin-fetch--tool.c
Simple merge

diff --cc git-cvsexportcommit.perl
Simple merge