[tor-commits] [sbws/master] Merge branch 'issue159' from juga, thanks!