From: Nick Mathewson Date: Thu, 13 Jun 2013 13:40:32 +0000 (-0400) Subject: Merge remote-tracking branch 'public/bug8822' into maint-0.2.4 X-Git-Tag: tor-0.2.5.1-alpha~154^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25dddf7a8f30699242b52fce115f29401f63ee9c;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug8822' into maint-0.2.4 --- 25dddf7a8f30699242b52fce115f29401f63ee9c