Added documentation in docs/refguide.xml for --data and --data-string options
Remove some minor changes to timing updates in connect scans

This change restores the control flow of handling connect() return and
error values. This shouldn't result in any real changes, but makes it
simpler to see the differences introduced in r33185.
Make a more descriptive error when raw sockets fail.

Doesn't happen often, but as the message says, certain Solaris zones can
cause problems here. This message is more informative than the previous
"socket troubles in Init"
Process 200 OS fingerprint submissions
Manual merging of OS fingerprints

Because of previous merging, some fingerprints had grown to encompass
others. Other fingerprints for the same or similar devices were close
enough that they could be merged. This was a manual review of 614
fingerprints that were identified as differing from some other
fingerprint by only the SEQ line (256 unique non-SEQ fingerprints).

The result: 44 fingerprints were merged into others, or were deleted
because they were a proper subset of some other fingerprint (e.g. Linux
2.6.17 that is not distinguishable from a broader Linux 2.6.11-2.6.32
fingerprint). A couple of these appeared to be identical copy-and-paste
errors in the past. I was very conservative in what I chose to merge,
choosing only the most-obvious fingerprint pairs that did not lose
information (e.g. not merging unrelated specialized devices, even if
their fingerprints were very close).
Process 250 more OS fingerprint submissions
Process 250 more OS fingerprint submissions
Process 200 more OS fingerprint submissions
Process 200 more OS fingerprint submissions
Process 177 more OS fingerprint submissions
If verbosity is greater than 1 (i.e. -vv or higher is used), automatically do reason display (i.e. --reason).
Show TTL in default output if "--reason -v" is asked for.
Add mandatory cipher suite to appropriate scripts

The TLS standard (TLS 1.2, but also probably the others) states:

> In the absence of an application profile standard specifying
> otherwise, a TLS-compliant application MUST implement the cipher
> suite TLS_RSA_WITH_AES_128_CBC_SHA

This was causing some problems with some implementations (See
http://seclists.org/nmap-dev/2014/q3/119)
NSE: Add TLS_RSA_WITH_3DES_EDE_CBC_SHA to default ciphers

As noted (http://seclists.org/nmap-dev/2014/q3/121), some versions of
Windows require a KB before supporting AES, so add a 3DES option.
This should probably be static.
Remove an unneeded duplicate variable assignment.
Revert my unfinished refactoring commit I pushed by mistake.
Make -Pn override all other -P* types

This was a case where order of arguments affected the outcome: if -PE
came before -Pn, then -Pn took precedence. Otherwise, -PE took
precedence (except that o.pingtype would also contain PINGTYPE_NONE...
not sure how that affected things). This cleans things up by letting
PINGTYPE_NONE be OR'd into o.opingtype, then checking for it after all
options have been processed and clearing out the other types if it is
found.
Remove use of branch-reset pattern from nmap-service-probes

branch-reset patterns (?|...) were introduced in Perl 5.10.0, but some
folks complained when their older PCRE libs crashed on this line.
This changes the use into a single outer capture, then uses the $P()
helper function to strip out the unprintable length bytes.
Fix Ncat's SOCKS5 password auth

See http://seclists.org/nmap-dev/2014/q3/4