Commit e7fe92709e7f83e5189cbcf485ec3a040f0710b5

Nick Mathewson 2011-07-04T12:16:08

Merge remote-tracking branch 'github/20_global_locks_init' into patches-2.0