]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 18:02:11 +0000 (14:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 18:02:11 +0000 (14:02 -0400)
commitf5c59eb28a82b5dbdf9e08955cd6129e8b824c4e
tree302b81d0fd1d43249011d508cc9d7ab3621a9ec2
parent2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a
parent650e2aac46ed9857eed1863cefda45c632bb21eb
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.