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

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

48cd096276590e40540bc255b2610931351b14cb