merged changes from RC_1_0 to change email address from @rasterbar.com to @libtorrent.org

git-svn-id: http://svn.code.sf.net/p/libtorrent/code/trunk@10395 a83610d8-ad2a-0410-a6ab-fc0612d85776
fix makefile build

git-svn-id: http://svn.code.sf.net/p/libtorrent/code/trunk@10396 a83610d8-ad2a-0410-a6ab-fc0612d85776