[tor-commits] [tor/master] Merge branch 'ticket40382_045' into maint-0.4.5