[tor-commits] [tor/master] Merge branch 'bug33087_042' into bug33087_043