From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Jul 2011 16:54:51 +0000 (-0400)
Subject: Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1
X-Git-Tag: tor-0.2.2.30-rc~8^2~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=021cf3f0521375f1722a7fb82ce286086db79142;p=thirdparty%2Ftor.git

Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1
---

021cf3f0521375f1722a7fb82ce286086db79142