From: Roger Dingledine <arma@torproject.org>
Date: Sat, 12 Mar 2011 01:37:21 +0000 (-0500)
Subject: Merge commit 'sebastian/bug2663' into maint-0.2.2
X-Git-Tag: tor-0.2.2.24-alpha~6^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=600ad7bf8d499d04259586bcf91afed7dfb88f99;p=thirdparty%2Ftor.git

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

600ad7bf8d499d04259586bcf91afed7dfb88f99