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