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