Commit ab0f5f18fd8f41f092baf76c85b29402bc004010

Nick Mathewson 2011-10-12T00:57:55

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