Commit 8827dbc3e9f0135d4c88a8ed803c7cabe16f94b8

Nick Mathewson 2012-09-12T20:19:22

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