From: Nick Mathewson Date: Fri, 11 Jun 2010 17:25:38 +0000 (-0400) Subject: Merge commit 'sjmurdoch/xxx-using-spdy' X-Git-Tag: tor-0.2.2.14-alpha~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faef0fa35ddab7557eb22cb1740f5c4aee4c018d;p=thirdparty%2Ftor.git Merge commit 'sjmurdoch/xxx-using-spdy' --- faef0fa35ddab7557eb22cb1740f5c4aee4c018d