Commit 177f28680e2406f21c513cd3d44a9602f4df2822

Nick Mathewson 2011-10-12T00:21:29

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