OJ b42f4f5cd2 Merge branch 'upstream/master' into multi-transport-support ...

Conflicts:
	lib/msf/core/payload/windows/stageless_meterpreter.rb
	lib/msf/core/payload/windows/x64/stageless_meterpreter.rb
	lib/rex/post/meterpreter/client_core.rb
	modules/payloads/stages/linux/x86/meterpreter.rb
	modules/payloads/stages/windows/meterpreter.rb
	modules/payloads/stages/windows/x64/meterpreter.rb

2015-05-05 07:53:54 +10:00

..

auxiliary

Land #5178, @jboss_vulnscan check for console default admin

2015-05-01 17:38:20 -05:00

encoders

Fix #4717 - Change AllowWin32SEH's default to false

2015-02-06 12:38:04 -06:00

exploits

add OSVDB ref

2015-05-04 14:27:44 -06:00

nops

Fix up comment splats with the correct URI

2014-10-17 11:47:33 -05:00

payloads

Merge branch 'upstream/master' into multi-transport-support

2015-05-05 07:53:54 +10:00

post

Land #5184, restore store_loot for ssh_creds gatherer

2015-04-24 13:55:06 -05:00