This is an "-s ours" commit to avoid taking a5704b1c624c9a808f5, which was a cherry-picked backport of fdbb9cdf746bbf0c39c34 to add a SHA256-HMAC function.
Nick Mathewson