[tor-commits] [tor/master] Merge branch 'bug33032_042' into bug33032_043