From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Feb 2010 17:45:01 +0000 (-0500)
Subject: Merge remote branch 'sebastian/bug1254'
X-Git-Tag: tor-0.2.2.9-alpha~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c084ae145e7eb77303ce401083a94b0d9d7fe57e;p=thirdparty%2Ftor.git

Merge remote branch 'sebastian/bug1254'
---

c084ae145e7eb77303ce401083a94b0d9d7fe57e