merged Steven Siloti's peer crypto patch into trunk

git-svn-id: http://libtorrent.googlecode.com/svn/trunk@10516 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
merged fixed include

git-svn-id: http://libtorrent.googlecode.com/svn/trunk@10518 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda