merged changes from RC_1_0

git-svn-id: svn://svn.code.sf.net/p/libtorrent/code@10526 a83610d8-ad2a-0410-a6ab-fc0612d85776
fix assert

git-svn-id: svn://svn.code.sf.net/p/libtorrent/code@10527 a83610d8-ad2a-0410-a6ab-fc0612d85776
merged fix from RC_1_0

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