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

Merge remote branch 'sebastian/bug1238'
---

6dd71d314dfe361aab52628e54f3aa9666c115e4