]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f3ec43 650e2aa)
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)
This is an "-s ours" commit to avoid taking a5704b1c624c9a808f5,
which was a cherry-picked backport of fdbb9cdf746bbf0c39c34 to add
a SHA256-HMAC function.


Trivial merge
Mirror of https://git.torproject.org/tor.git