Commit ddcca1760f7ef0fc9c4abf09a2af8aff6dec702e

Nick Mathewson 2011-04-04T15:09:47

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