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