Commit a60632a1ec6649dfa0be175d064b1ca6192cc5bf

Nick Mathewson 2013-11-01T14:21:54

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