Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
commitf089804332c0289159ec432d8ce82bb1ed6316aa
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 20:31:19 +0000 (3 15:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Jan 2011 20:31:19 +0000 (3 15:31 -0500)
tree99e554c39190c48f67ab59fd176f3b3d27b25798
parentcee433d751a2521fc6368ac01c1c67773a27c85a
parente365aee97110c6c6df6f56ca9814d88c3808a2d1
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
src/common/util.c