Tribler/tribler — pull request #1069 by whirm (2014-12-23 10:52:19+00:00)
Title: Improve crypto for next

cherry picked from ```devel```'s PR