Commit 1f5a48d1d031f5c0daba8cd3ba5500dbae5693ef

Nick Mathewson 2012-11-15T11:45:12

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