[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6