Commit 66dacfa2a58602d82e0413c8217ec38c9871d5cf

Nick Mathewson 2013-04-25T13:43:49

Merge remote-tracking branch 'origin/pr/36' into patches-2.0