From: Roger Dingledine <arma@torproject.org>
Date: Wed, 29 Sep 2010 21:05:38 +0000 (-0400)
Subject: Merge commit 'mikeperry/bug1740' into maint-0.2.2
X-Git-Tag: tor-0.2.2.17-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=474e4d2722d52cf225a88cb7b7c677273b8f50ac;p=thirdparty%2Ftor.git

Merge commit 'mikeperry/bug1740' into maint-0.2.2
---

474e4d2722d52cf225a88cb7b7c677273b8f50ac