[tor-commits] [sbws/master] Merge pull request #176 from juga0/issue160