]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:20:40 +0000 (19:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:20:40 +0000 (19:20 -0400)

Trivial merge