From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 May 2011 04:14:10 +0000 (-0400)
Subject: Merge branch 'bug1352' into maint-0.2.2
X-Git-Tag: tor-0.2.3.2-alpha~133^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b47f574c1e27b8665e9e2658409645a3831e7aa4;p=thirdparty%2Ftor.git

Merge branch 'bug1352' into maint-0.2.2
---

b47f574c1e27b8665e9e2658409645a3831e7aa4