Commit b3bc77b673dd4344456d8dde5a3ddf635004b1c7

Nick Mathewson 2011-10-03T12:54:35

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