[tor-commits] [tor/master] Merge branch 'bug23571_033_squashed'