Commit 15f989ad3365a7fe9e34ab8d26e5fbcaa3257291

Nick Mathewson 2012-11-18T01:44:09

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