Commit 2ebc8c80bf99a166e246b39df20aa6f45e062444

Nick Mathewson 2011-11-14T11:55:37

Merge remote-tracking branch 'origin/patches-2.0'