Merge branch 'master' into bleeding-jumbo

* master:
  1.7.9.10: - Status reporting has been enhanced.
  Force inlining of single_key_hash()
  Have single_add_key() call single_process_buffer() on its own, don't leave that for the caller.
  In single crack mode, avoid inflating the candidate password count (as used for the p/s rate calculation) by passwords that came from successful guesses for individual salts and thus are being tried for all salts.  These are reliably known not to be unique/new password candidates, so their testing against all salts should only be counted in c/s and C/s, but not in p/s, where they have already been counted once (for the salt where the initial guess for each of these passwords occurred).
  Enhanced the status reporting to include not only combinations per second (previously reported as c/s), but also guesses per second (g/s), candidate passwords per second (p/s), hashes computed (also known as crypts) per second (now reported as c/s).  The old combinations per second metric is now reported as C/s.

Conflicts:
	src/cracker.c
	src/loader.h
	src/params.h
	src/recovery.c
	src/single.c
	src/status.c
	src/status.h