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