[tor-commits] [tor/master] Forward-port bug9665 fix to work with our fix for 11069