Apply r43464 on a new branch.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/log-timestamps-7711@43473 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb