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.
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).
Have single_add_key() call single_process_buffer() on its own, don't leave that
for the caller.

Source code indentation: consistently put the blocks after "if" on a new line.
Force inlining of single_key_hash()
1.7.9.10:
- Status reporting has been enhanced.
Removed a redundant call to inc_new_count()
Set rec_entry and rec_length before the crk_process_key("") call in case it
triggers fix_state() and/or save_state()
In inc_new_length(), zeroize the [CHARSET_SIZE] elements of char2 and chars.
This fixes a bug that was introduced with dropping of the memset() calls.
Redefined real_min and real_max to be indices rather than characters
Implemented the --node=MIN[-MAX]/TOTAL option, initially only usable with
incremental mode and with wordlist rules.
1.7.9.11:
- The --node=MIN[-MAX]/TOTAL option has been added
Merge branch 'master' into bleeding-jumbo

* master:
  1.7.9.11: - The --node=MIN[-MAX]/TOTAL option has been added
  Implemented the --node=MIN[-MAX]/TOTAL option, initially only usable with incremental mode and with wordlist rules.
  Redefined real_min and real_max to be indices rather than characters
  In inc_new_length(), zeroize the [CHARSET_SIZE] elements of char2 and chars. This fixes a bug that was introduced with dropping of the memset() calls.
  Set rec_entry and rec_length before the crk_process_key("") call in case it triggers fix_state() and/or save_state()
  Removed a redundant call to inc_new_count()
  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:
	doc/CHANGES
	src/cracker.c
	src/inc.c
	src/loader.h
	src/options.c
	src/options.h
	src/params.h
	src/recovery.c
	src/single.c
	src/status.c
	src/status.h
	src/wordlist.c
MPI vs. node/count fixes.
Bugfix for MSCHAPv2.
Node support for Markov.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Node support for Markov.
  Bugfix for MSCHAPv2.
  MPI vs. node/count fixes.
  1.7.9.11: - The --node=MIN[-MAX]/TOTAL option has been added
  Implemented the --node=MIN[-MAX]/TOTAL option, initially only usable with incremental mode and with wordlist rules.
  Redefined real_min and real_max to be indices rather than characters
  In inc_new_length(), zeroize the [CHARSET_SIZE] elements of char2 and chars. This fixes a bug that was introduced with dropping of the memset() calls.
  Set rec_entry and rec_length before the crk_process_key("") call in case it triggers fix_state() and/or save_state()
  Removed a redundant call to inc_new_count()
  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.