diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-26 14:02:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-26 14:02:11 -0400 |
| commit | f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e (patch) | |
| tree | 302b81d0fd1d43249011d508cc9d7ab3621a9ec2 | |
| parent | 2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a (diff) | |
| parent | 650e2aac46ed9857eed1863cefda45c632bb21eb (diff) | |
| download | tor-f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e.tar.gz tor-f5c59eb28a82b5dbdf9e08955cd6129e8b824c4e.zip | |
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.
0 files changed, 0 insertions, 0 deletions