Merge branch 'maint'

* maint:
merge-recursive: do not return NULL only to cause segfault
retry request without query when info/refs?query fails

diff --cc merge-recursive.c
Simple merge

diff --cc remote-curl.c
Simple merge