From: philsmd <philsmd@hashcat.net>
Date: Tue, 5 Jul 2016 13:13:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://www.flypig.org.uk/git/?p=hashcat.git;a=commitdiff_plain;h=f326c5de4c5ecc09fb9801e709885ddeafa6c67c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/changes.txt
---

f326c5de4c5ecc09fb9801e709885ddeafa6c67c
diff --cc docs/changes.txt
index 81f3b40,9e8c1a3..a0a7d4a
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@@ -14,7 -14,7 +14,8 @@@
  - Fixed a bug where hashcat is suppressing --machine-readable output in the final status update
  - Fixed a bug where hashcat did not check the return of realpath() and crashes uncontrolled if the path does not exist
  - Fixed a bug where hashcat crashes for accessing deallocated buffer if user spams "s" shortly before hashcat shuts down
+ - Fixed a bug where hashcat crashes in case of a scrypt P setting > 1
 +- Fixed a bug where hashcat did not correctly use the newly cracked plains whenever --loopback or the induction folder was used
  
  * changes v2.01 -> v3.00: