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