Commit e9d095d4fcd120c1dd8192c4244eba9d6c384da5

Nick Mathewson 2011-06-11T01:41:19

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: test/tinytest.c