[tor-commits] [tor/master] Merge branch 'ticket33678_043' into ticket33678_master