Commit db7acd1310732f8240c6919a4cfb7267fcd46032

Nick Mathewson 2013-12-20T13:37:39

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