Commit df19ba6a0365d1dc480d5a6ffa9855fdec9910fc

Nick Mathewson 2012-02-09T15:16:02

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