Fix TorControlSocket shutdown hang by adding timeout#256

MHT417 wants to merge 2 commits intoRetroShare:masterRetroShare/libretroshare:masterfrom

MHT417:masterMHT417/libretroshare:masterCopy head branch name to clipboard