From: Roger Dingledine Date: Thu, 30 Sep 2010 03:52:18 +0000 (-0400) Subject: Merge branch 'bug1772' into maint-0.2.2 X-Git-Tag: tor-0.2.2.17-alpha~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cbe463e964d71b401e11b29dc356bf6ef855f7f;p=thirdparty%2Ftor.git Merge branch 'bug1772' into maint-0.2.2 --- 3cbe463e964d71b401e11b29dc356bf6ef855f7f