From: Nick Mathewson Date: Mon, 27 Sep 2010 19:39:40 +0000 (-0400) Subject: Merge remote branch 'public/bug1954' into maint-0.2.2 X-Git-Tag: tor-0.2.2.17-alpha~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3859615429ec8d3939e21cd65fa07cc56bb5d0c;p=thirdparty%2Ftor.git Merge remote branch 'public/bug1954' into maint-0.2.2 --- e3859615429ec8d3939e21cd65fa07cc56bb5d0c