Merge branch release into master

Browse Source

This resync's release and master after cherry-picking the
openssl_heartbleed module for release.

Conflicts:
	modules/auxiliary/scanner/ssl/openssl_heartbleed.rb

bug/bundler_fix

Brandon Turner 2014-04-10 06:32:58 -07:00

parent fe066ae944 f02492aba0

commit 9ca3d95980

No known key found for this signature in database

GPG Key ID: 0F82931CA3EE1B07

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available