Fix multi-line output due to bad regex flag
Merge remote-tracking branch 'upstream/master'
typo in method name
Fixups to the Linksys module

Professionalizes the description a little, but more importantly, handles
LANIP better, I think. Instead of faking a 1.1.1.1 address, just detect
if it's set or not in a method and return the right thing accordingly.

Please test this before landing, obviously. I think it's what's
intended.
Add pcaprub to gem deps
Note linking strat in comment docs
Merge remote-tracking branch 'upstream/master'
Merge branch 'http/auth_methods' of git://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-http/auth_methods
Allow user to set ssl cipher

Rex::Socket::Tcp now allows the user to specify a cipher or ciphers to
try and use for the ssl connection in addition to the version.
Merge branch 'rapid7' into dmaloney-r7-http/auth_methods
Add Simple Web Server dir traversal
Return a Request object

Still changes the return type, but now at least .to_s will give you the
right thing and at least a Request object is a logical thing to return.
typo
Fix a bug reported by Tom Liston
Merge pull request #5 from jlee-r7/dmaloney-r7-http/auth_methods

Return a Request object
There aint no fail_with(), must use print_error
Allow arbitrary depth
Do a check and make sure this is Simple Web Server
Don't really need the bottom comment
That's what he said.