[tor-commits] [tor/release-0.4.3] Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test