Commit 1f50f3a3a8c25374156d42e17817f93ad02fbfaa

Nick Mathewson 2012-03-22T13:47:30

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