From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 28 May 2011 06:07:48 +0000 (-0400)
Subject: Merge branch 'bug2574' into maint-0.2.1
X-Git-Tag: tor-0.2.2.28-beta~8^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee72557d528a846661d4d1d794c127de8c3ef1eb;p=thirdparty%2Ftor.git

Merge branch 'bug2574' into maint-0.2.1
---

ee72557d528a846661d4d1d794c127de8c3ef1eb