Commit 65c920c9f13265a86ec493282bf62bfff89bbfca

Nick Mathewson 2011-09-25T07:41:29

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