[tor-commits] [tor/master] Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3