miner: Consider nonces vs pdiff in the watchdog
Merge branch 'feature/watchdog-consider-nonces' into feature/reinit-hung-gridseed

Conflicts:
	miner.c