Commit 36f745df225e5d110365a360aa7bfe63e66a1ce3

Nick Mathewson 2011-06-01T13:52:27

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