From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Apr 2010 17:37:33 +0000 (-0400)
Subject: Merge branch 'correct_halflife'
X-Git-Tag: tor-0.2.2.11-alpha~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4;p=thirdparty%2Ftor.git

Merge branch 'correct_halflife'
---

fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4