merged changes from RC_1_0

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

git-svn-id: http://svn.code.sf.net/p/libtorrent/code/trunk@10648 a83610d8-ad2a-0410-a6ab-fc0612d85776
add option to client_test to remove web seeds

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

git-svn-id: http://svn.code.sf.net/p/libtorrent/code/trunk@10650 a83610d8-ad2a-0410-a6ab-fc0612d85776
improve printing of rates and counters in client_test

git-svn-id: http://svn.code.sf.net/p/libtorrent/code/trunk@10651 a83610d8-ad2a-0410-a6ab-fc0612d85776
fix assert in utp_stream at high rates

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