* nd/hash-object-sanity:
  Make hash-object more robust against malformed objects

Conflicts:
	cache.h