(Done as separate patch from trunk as the code has diverged quite a bit.)

    warning: 'utime.mtime_ns' may be used uninitialized in this function [-Wmaybe-uninitialized]

Patch by Sijin Joseph.

testcleanup directive is new as of 1.1, and we are currently running
1.0.7.  But using testsetup works just as well, and avoids the
unknown directive error when building the docs.

'SHA1' instead of 'SHA'.

With the exception of the 'as_string' call in the policy docs.
That one is a separate issue.

Note that when building the docs sphinx is complaining about
.. testcleanup:: being an invalid directive.  I don't know
why this is, as I'm following the sphinx docs...but fortunately
the action is to omit the text in the body, so the generated
documentation is correct.

With help from jkloth on IRC, so it will hopefully work
this time :)

Patch by Chris Jerdonek

Also including this change in 3.3 to help avoid spurious conflicts
between the two most active branches.

(Initial patch by Indra Talip)

Patch from Phil Connell.

Replace 8 spaces with 4.

CID 486199

CID 1058280

X509_get_version() grows beyond our small int cache.
CID 1058279

CID 1058288