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

This commit is contained in:
Nick Mathewson 2014-12-01 08:32:23 -05:00
commit 6ae44b5da9

Diff Content Not Available