[tor-commits] [lego/master] Merge branch 'i-40' into 'master'