[tor-commits] [tor/master] Merge branch 'bug8844_v2' into maint-0.2.3