[tor-commits] [tor/master] Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged