Commit 2179d7359fecda9880cf15f9746b4f07bbecb055

Nick Mathewson 2011-09-16T09:47:14

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