]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug3122_memcmp_023'
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:27:18 +0000 (19:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:27:18 +0000 (19:27 -0400)
1  2 
src/or/directory.c
src/or/microdesc.c

Simple merge
Simple merge