[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug25705_v3_033'