Commit 3e9612cd81c8a9881ef298fa59c40af343e4f126

Nick Mathewson 2012-03-22T12:17:30

Merge branch 'global_shutdown_rebased_v2'