]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug13476-improve-time-handling'
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Oct 2014 17:14:27 +0000 (13:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Oct 2014 17:14:27 +0000 (13:14 -0400)

Trivial merge