p2v: avoid connecting to ourself while probing qemu-nbd (RHBZ#1167774)
diff/diff.c: diff output to show correct file handles and presence symbol
Version 1.29.16.