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