Commit fed8f6e4845bd7990cc5505c8a590fc7bff73d43

Nick Mathewson 2011-10-10T11:34:26

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