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