commit f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e Merge: 2f3ec43 650e2aa Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 26 14:02:11 2012 -0400 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.