Commit 46974cd877e3ac1e17ff39281a646025912a7560

Nick Mathewson 2011-09-28T09:23:41

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