[tor-commits] [sbws/master] Merge branch 'bug30747_11' into maint-1.1