Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source

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

...

This commit is contained in:

Nick Mathewson

2012-03-26 14:02:11 -04:00

parent 2f3ec43e5b 650e2aac46

commit f5c59eb28a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available