Commit 614a1712b77b6cb5b9e56cbc8a53077b6f66b8cc

Nick Mathewson 2011-04-22T23:46:25

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