Commit d5318b664db906a19ebb3cefefbdf065cf1330c6

Nick Mathewson 2012-10-26T19:34:47

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