Commit f5b3ff20d30557b083366168008be3870f9bd6c1

Nick Mathewson 2012-11-19T10:58:04

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