]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/warn-when-time-goes-backwards'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Oct 2015 11:56:28 +0000 (13:56 +0200)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Oct 2015 11:56:28 +0000 (13:56 +0200)

Trivial merge