]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7221d15 96a0edf)
Merge branch 'correct_halflife'
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Apr 2010 17:37:33 +0000 (13:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Apr 2010 17:37:33 +0000 (13:37 -0400)

Trivial merge
Mirror of https://git.torproject.org/tor.git