From: Roger Dingledine <arma@torproject.org>
Date: Sun, 16 Jan 2011 02:54:49 +0000 (-0500)
Subject: Merge commit 'sebastian/bug2317' into maint-0.2.2
X-Git-Tag: tor-0.2.2.21-alpha~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7699014e1e9e183d1fd840e59909bcf77ba3321b;p=thirdparty%2Ftor.git

Merge commit 'sebastian/bug2317' into maint-0.2.2
---

7699014e1e9e183d1fd840e59909bcf77ba3321b