Vanilla/Vanilla — pull request #584 by Karang (2013-02-14 16:39:57+00:00)
Title: Finalize protocol encryption.

Signed-off-by: Karang