merged changes from trunk

git-svn-id: http://libtorrent.googlecode.com/svn@10059 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
remove leftover comparison from when there was more than one proxy setting

git-svn-id: http://libtorrent.googlecode.com/svn@10060 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
fixed typo

git-svn-id: http://libtorrent.googlecode.com/svn@10061 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
removed left-over unused variables

git-svn-id: http://libtorrent.googlecode.com/svn@10062 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
apparently PYTHON_EXTRA_LDFLAGS is for internal python use only. fix m4 script

git-svn-id: http://libtorrent.googlecode.com/svn@10063 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
fix documentation

git-svn-id: http://libtorrent.googlecode.com/svn@10064 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
polishing, update copyright

git-svn-id: http://libtorrent.googlecode.com/svn@10065 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
fix openssl usage in unit tests makefile

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