Commit 804f77fbb8cdd988d60c8ca1d98506406c81f5b1

Nick Mathewson 2011-09-01T17:39:37

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