Commit 0586c25ec8a213fe6810704b3be6947a27b7ca1f

Nick Mathewson 2011-12-14T16:28:18

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