[tor-commits] [tor] 02/04: Merge branch 'ticket40730_045_01' into maint-0.4.5