Integrate OpenSSL commit 9fe4603b8245425a4c46986ed000fca054231253:
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Tue Feb 12 14:55:32 2013 +0000

    Check DTLS_BAD_VER for version number.

    The version check for DTLS1_VERSION was redundant as
    DTLS1_VERSION > TLS1_1_VERSION, however we do need to
    check for DTLS1_BAD_VER for compatibility.

    PR:2984
    (cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)

Approved by:	benl
Import vendor fixes:

197e0ea	Fix for TLS record tampering bug.  (CVE-2013-4353).
3462896	For DTLS we might need to retransmit messages from the
	previous session so keep a copy of write context in DTLS
	retransmission buffers instead of replacing it after
	sending CCS.  (CVE-2013-6450).
ca98926 When deciding whether to use TLS 1.2 PRF and record hash
	algorithms use the version number in the corresponding
	SSL_METHOD structure instead of the SSL structure.  The
	SSL structure version is sometimes inaccurate.
	Note: OpenSSL 1.0.2 and later effectively do this already.
	(CVE-2013-6449).
Import OpenSSL 1.0.1f.

Approved by:	so (delphij), benl (silence)
3947 zpool(1M) references nonexistent zfs-features(5)
4540 zpool(1M) man page doesn't describe "readonly" property
3948 zfs sync=default is not accepted
4611 zfs(1M) still mentions 'send -r' in synopsis
4415 zpool(1M) man page missing "import -m" description

illumos/illumos-gate@409f1c06a8ed7e94e186a77bff5bfe5f77c5ebb1
4570 Document dedupditto pool property
4572 Dedup-related documentation additions for zpool and zdb.
1371 Add -D option description to zpool(1M) manpage

illumos/illumos-gate@e902ed8e4d63380fc7ba67f74c52053dcedf7761
4571 Add documentation for -T and interval to "zpool list"

illumos/illumos-gate@b55998b6d68438193f311140cafa2104f2038571
4573 ZFS snapshot alias

illumos/illumos-gate@7dbbcd8300f0241d3ec9686f2a0a06107c1b90cb
3993 zpool(1M) and zfs(1M) should support -p for "list" and "get"
4700 "zpool get" doesn't support -H or -o options

illumos/illumos-gate@c58b352673e88983cd2b8a388a8c7625f35e2f18
Import OpenSSL 1.0.1g.

Approved by:	benl (maintainer)
4374 dn_free_ranges should use range_tree_t

(MD code for highbit64 omitted)

illumos/illumos-gate@bf16b11e8deb633dd6c4296d46e92399d1582df4
3897 zfs filesystem and snapshot limits

illumos/illumos@a2afb611b30628fb74ad9eade4ae465f9031e262
3835 zfs need not store 2 copies of all metadata

illumos/illumos-gate@edf345e6b8342e8627ec20ce821a977a62cee19d
2915 DTrace in a zone should see "cpu", "curpsinfo", et al
2916 DTrace in a zone should be able to access fds[]
2917 DTrace in a zone should have limited provider access

illumos/illumos-gate@b0f673c4626e4cb1db7785287eaeed2731dfefe8
4477 DTrace should speak JSON

illumos/illumos-gate@f497f9fe231e0e400f339c84a7d80c4aae2ac4d5
4248 dtrace(1M) should never create DOF with empty probes section
4249 Only probes from the first DTrace object file will be included

illumos/illumos-gate@54a20ab41aadcb81c53e72fc65886e964e9add59

The r258379 import of this change omitted the tests.
Fix case when vt(4) started w/o driver assigned.
o Always init locks and cv ASAP.
o Initialize driver-independent parts even if driver probing fail.
o Allow to call vt_upgrade anytime, for later loaded drivers.
o New window flag VWF_READY, to track if window already initialized.
Other updates:
o Pass vd as a cookie for kbd_allocate.
o Do not blank window on driver replacement.

Tested by:	hselasky (RPi), emaste(VGA, EFIFB, KMS), me

MFC after:	7 days
Sponsored by:	The FreeBSD Foundation
Remove the unnecessary i2c slave address assignment.

The ti_i2c controller only works in the master mode and the i2c address
passed on iicbus_reset() is used to set the controller slave address when
operating as an i2c slave (which isn't currently supported).

When talking to a slave, the slave address is correctly provided to
ti_i2c_tranfer().
vt fontcvt: Make height and width optional arguments

Now defaults to a 16x8 font size.  The height and width can be specified
using -h and -w respectively.

Sponsored by:	The FreeBSD Foundation
vt fontcvt: Make the bold font optional

Sponsored by:	The FreeBSD Foundation
Fix incorrect error handling in PAM policy parser. [SA-14:13]