From: Nick Mathewson Date: Mon, 26 Mar 2012 18:02:11 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.2' X-Git-Tag: tor-0.2.3.13-alpha~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.2' This is an "-s ours" commit to avoid taking a5704b1c624c9a808f5, which was a cherry-picked backport of fdbb9cdf746bbf0c39c34 to add a SHA256-HMAC function. --- f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e