Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
commit59a6df8882cbb404a5d22d99ce99684348aea8c8
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:25:14 +0000 (12 19:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2011 23:25:14 +0000 (12 19:25 -0400)
treeb7be88ea50c4a71201ae940dec2dbd490faf0b78
parent379de3d10acd45f02aa6c64f54de9b7faa634df5
parent8fb38331c3213caef2d2e003e02cdb361504f14f
Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
src/or/directory.c
src/or/microdesc.c