Merge branch 'master' into next
* master:
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing
janitor: useless checks before free
janitor: add DIV_ROUND_UP and use it.
refactor: use bitsizeof() instead of 8 * sizeof()
janitor: use NULL and not 0 for pointers.
git stash: modernize use of "dashed" git-XXX calls
Improve doc for format-patch threading options.
List send-email config options in config.txt.
configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests
Trailing whitespace and no newline fix
diff --cc: a lost line at the beginning of the file is shown incorrectly
combine-diff.c: fix performance problem when folding common deleted lines