merged change from RC_1_0

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