Merge branch 'correct_halflife'
commitfe57aab2832160d1c256aa9d6e70cd5e1cd29aa4
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Apr 2010 17:37:33 +0000 (13 13:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Apr 2010 17:37:33 +0000 (13 13:37 -0400)
tree011a9e53889fa6bb87e14cf84da2af77a138a6f2
parent7221d15acc87d2438aba7e3c261c2fc460479a01
parent96a0edf373b52da382206d12716ebd1cb96a1518
Merge branch 'correct_halflife'